From ed1e001fdf345d3bf16206bbb5e566918823253e Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Tue, 31 Mar 2020 15:20:55 +0100 Subject: [PATCH] sqm-scripts: support in & out of tree cake packages Change dependency requirements based on kernel version. Ultimately in a post Linux 4_14 world the differentation can be removed. In the short term this allows post 4_14 kernels to use in-tree versions of the cake shaper. Signed-off-by: Kevin Darbyshire-Bryant --- net/sqm-scripts/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/sqm-scripts/Makefile b/net/sqm-scripts/Makefile index bab74678e..836d5b2d8 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:=5 +PKG_RELEASE:=6 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/tohojo/sqm-scripts @@ -24,8 +24,9 @@ include $(INCLUDE_DIR)/package.mk define Package/sqm-scripts SECTION:=net CATEGORY:=Base system - DEPENDS:=+tc +kmod-sched-core +kmod-sched-cake +kmod-ifb +iptables \ - +iptables-mod-ipopt +iptables-mod-conntrack-extra + 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 TITLE:=SQM Scripts (QoS) PKGARCH:=all endef