qosify: update to the latest version

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

diff --git a/package/network/config/qosify/Makefile b/package/network/config/qosify/Makefile
index de7615dc12876be428b064737db461428a5b564b..b15bde926dee829f72e6f843e9fb8e6859868a7f 100644 (file)
--- a/package/network/config/qosify/Makefile
+++ b/package/network/config/qosify/Makefile
@@ -11,14 +11,16 @@ 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:=2022-04-05
+PKG_SOURCE_VERSION:=1cd5e12eecdcab0845eda71383c4c0ba17092c6f
+PKG_MIRROR_HASH:=f16748114ad5cad8fe1fe40ea43959873c5b0e8b75ddc99fc4323e12f0ab3b53
+PKG_RELEASE:=$(AUTORELEASE)
 
 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,12 +28,20 @@ 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)
+  DEPENDS:=+libbpf +libubox +libubus +libnl-tiny +kmod-sched-cake +kmod-sched-bpf +kmod-ifb +tc $(BPF_DEPENDS)
 endef
 
+TARGET_CFLAGS += \
+       -Wno-error=deprecated-declarations \
+       -I$(STAGING_DIR)/usr/include/libnl-tiny \
+       -I$(STAGING_DIR)/usr/include
+
+CMAKE_OPTIONS += \
+       -DLIBNL_LIBS=-lnl-tiny
+
 define Build/Compile
        $(call CompileBPF,$(PKG_BUILD_DIR)/qosify-bpf.c)
        $(Build/Compile/Default)
@@ -39,17 +49,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))