From 9114244fbd1b66e1a48580ba04c7776925abc52f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 6 May 2020 22:12:48 +0200 Subject: [PATCH] sqm-scripts: Switch sch_cake dependency to new virtual package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- net/sqm-scripts/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sqm-scripts/Makefile b/net/sqm-scripts/Makefile index 23462d45c..c4d9ee21e 100644 --- a/net/sqm-scripts/Makefile +++ b/net/sqm-scripts/Makefile @@ -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