openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

sqm-scripts: Switch sch_cake dependency to new virtual package

Browse Source 
As reported in https://github.com/openwrt/packages/issues/12072, the
imagebuilder fails due to a dependency resolution error when the userspace
packages are built using a target that has a different kernel version than
that which is being run. To resolve this, move the sqm-scripts dependency
to a new virtual package, which hopefully should be consistent with the
actual kernel module being built.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
This commit is contained in:
Toke Høiland-Jørgensen
2020-05-06 22:12:48 +02:00
parent 03a27b26a4
commit 9114244fbd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/sqm-scripts/Makefile
View File

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=sqm-scripts PKG_NAME:=sqm-scripts
PKG_SOURCE_VERSION:=ab763cba8b1516b3afa99760e0ca884f8b8d93b8 PKG_SOURCE_VERSION:=ab763cba8b1516b3afa99760e0ca884f8b8d93b8
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.0
PKG_RELEASE:=7 PKG_RELEASE:=8
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/tohojo/sqm-scripts PKG_SOURCE_URL:=https://github.com/tohojo/sqm-scripts
@@ -26,7 +26,7 @@ define Package/sqm-scripts
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables \ DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables \
+iptables-mod-ipopt +iptables-mod-conntrack-extra \ +iptables-mod-ipopt +iptables-mod-conntrack-extra \
+!LINUX_4_14:kmod-sched-cake +LINUX_4_14:kmod-sched-cake-oot +kmod-sched-cake-virtual
TITLE:=SQM Scripts (QoS) TITLE:=SQM Scripts (QoS)
PKGARCH:=all PKGARCH:=all
endef endef