From a09346bfc0a08a7c6acdb5d54647442b17a335d1 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Tue, 17 Oct 2023 13:53:38 +0530 Subject: [PATCH] icwmp: Align with bbfdm plugins --- icwmp/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index 16a037344..1b73732ed 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=9.5.12 +PKG_VERSION:=9.5.13 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git @@ -23,6 +23,7 @@ PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk +include ../bbfdm/bbfdm.mk define Package/icwmp/default SECTION:=utils @@ -93,10 +94,7 @@ define Package/icwmp/default/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DIR) $(1)/lib/upgrade/keep.d - $(INSTALL_DIR) $(1)/etc/bbfdm/json/ $(INSTALL_DIR) $(1)/etc/udhcpc.user.d - $(INSTALL_DIR) $(1)/usr/lib/bbfdm - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libcwmpdm.so $(1)/usr/lib/bbfdm/libcwmpdm.so $(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd $(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp $(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp @@ -104,9 +102,10 @@ define Package/icwmp/default/install $(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/ $(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp - $(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user + $(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json) + $(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libcwmpdm.so) endef Package/icwmp/install = $(Package/icwmp/default/install)