sqm-scripts: Switch sch_cake dependency to new virtual package
authorToke Høiland-Jørgensen <redacted>
Wed, 6 May 2020 20:12:48 +0000 (22:12 +0200)
committerToke Høiland-Jørgensen <redacted>
Wed, 6 May 2020 20:12:48 +0000 (22:12 +0200)
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 <redacted>
net/sqm-scripts/Makefile

index 23462d45cc47dce0b1e7658f779edb6d568d2d26..c4d9ee21e3285ce33985b1cd2b99d62a01cb6821 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=sqm-scripts
 PKG_SOURCE_VERSION:=ab763cba8b1516b3afa99760e0ca884f8b8d93b8
 PKG_VERSION:=1.4.0
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/tohojo/sqm-scripts
@@ -26,7 +26,7 @@ define Package/sqm-scripts
   CATEGORY:=Base system
   DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables \
        +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)
   PKGARCH:=all
 endef
git clone https://git.99rst.org/PROJECT