sqm-scripts: support in & out of tree cake packages
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Tue, 31 Mar 2020 14:20:55 +0000 (15:20 +0100)
committerKevin Darbyshire-Bryant <6500011+ldir-EDB0@users.noreply.github.com>
Wed, 1 Apr 2020 21:01:59 +0000 (22:01 +0100)
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 <ldir@darbyshire-bryant.me.uk>
net/sqm-scripts/Makefile

index bab74678ee941ea91f16c6316ea540a9850f0d60..836d5b2d8cc8ad9704a4e97eac0d950d5d72a5b6 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:=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