qosify: install hotplug handler into /etc/hotplug.d/iface as well

[openwrt/openwrt.git] / package / network / config / qosify / Makefile

diff --git a/package/network/config/qosify/Makefile b/package/network/config/qosify/Makefile
index de7615dc12876be428b064737db461428a5b564b..cca2b7a51d4b1bf9077e7ff290b05a8a8b0de837 100644 (file)
--- a/package/network/config/qosify/Makefile
+++ b/package/network/config/qosify/Makefile
@@ -11,14 +11,15 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=qosify
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/qosify.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-11-08.1
-PKG_SOURCE_VERSION:=3a420e272c187885120b964059abdf3e06f10199
-PKG_MIRROR_HASH:=49a6bbb0801b790ce603aa8e3dfa73e681dc3f58fb9cbd524956bffe4c36eb7e
+PKG_SOURCE_DATE:=2021-11-21
+PKG_SOURCE_VERSION:=2743e58741b304c37858dbc44435a164215b0a87
+PKG_MIRROR_HASH:=7def343f6b4956bd8a58659f66fe90dfc12883ec81394c9d209eab613c4924c0
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_DEPENDS:=bpf-headers
+PKG_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -26,8 +27,8 @@ include $(INCLUDE_DIR)/bpf.mk
 include $(INCLUDE_DIR)/nls.mk
 
 define Package/qosify
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=utils
+  CATEGORY:=Base system
   TITLE:=A simple QoS solution based eBPF + CAKE
   DEPENDS:=+libbpf +libubox +libubus +kmod-sched-cake +kmod-sched-bpf +kmod-ifb +tc-full $(BPF_DEPENDS)
 endef
@@ -39,17 +40,28 @@ endef
 
 define Package/qosify/conffiles
 /etc/config/qosify
-/etc/qosify-defaults.conf
+/etc/qosify/00-defaults.conf
 endef
 
 define Package/qosify/install
-       $(INSTALL_DIR) $(1)/lib/bpf $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/net
+       $(INSTALL_DIR) \
+               $(1)/lib/bpf \
+               $(1)/usr/sbin \
+               $(1)/etc/init.d \
+               $(1)/etc/config \
+               $(1)/etc/qosify \
+               $(1)/etc/hotplug.d/net \
+               $(1)/etc/hotplug.d/iface
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/qosify-bpf.o $(1)/lib/bpf
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qosify $(1)/usr/sbin/
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/qosify \
+               ./files/qosify-status \
+               $(1)/usr/sbin/
        $(INSTALL_BIN) ./files/qosify.init $(1)/etc/init.d/qosify
-       $(INSTALL_DATA) ./files/qosify-defaults.conf $(1)/etc/qosify-defaults.conf
+       $(INSTALL_DATA) ./files/qosify-defaults.conf $(1)/etc/qosify/00-defaults.conf
        $(INSTALL_DATA) ./files/qosify.conf $(1)/etc/config/qosify
        $(INSTALL_DATA) ./files/qosify.hotplug $(1)/etc/hotplug.d/net/10-qosify
+       $(INSTALL_DATA) ./files/qosify.hotplug $(1)/etc/hotplug.d/iface/10-qosify
 endef
 
 $(eval $(call BuildPackage,qosify))