qosify: add qosify-status script

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

diff --git a/package/network/config/qosify/Makefile b/package/network/config/qosify/Makefile
index 3c055c2af65d4c014ab55333878ad25046dfe011..01c6498e00098c34d03ba847772b0abb57e19834 100644 (file)
--- a/package/network/config/qosify/Makefile
+++ b/package/network/config/qosify/Makefile
@@ -11,24 +11,26 @@ 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-01
-PKG_SOURCE_VERSION:=52a57bf0e4eb2c6419be304981c5c94adb32d037
-PKG_MIRROR_HASH:=11a5f2650cf9c4979455ca230eb9ceddb035e6914bda78cf75b8dd7ebaff65d3
+PKG_SOURCE_DATE:=2021-11-19
+PKG_SOURCE_VERSION:=e728a319a9a5ac692d18fef936e6ac4377f1bbf1
+PKG_MIRROR_HASH:=86362483e4462a9dc4c4c31363a9a43a140472f105da363053e07e2486fff24f
 
 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
 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 +tc-full $(BPF_DEPENDS)
+  DEPENDS:=+libbpf +libubox +libubus +kmod-sched-cake +kmod-sched-bpf +kmod-ifb +tc-full $(BPF_DEPENDS)
 endef
 
 define Build/Compile
@@ -38,15 +40,18 @@ 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/hotplug.d/net $(1)/etc/qosify
        $(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
 endef