From d440af07b127ea610079a89e8e4487bf3f8bcd49 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Tue, 17 Oct 2023 13:54:33 +0530 Subject: [PATCH] obuspa: Align with bbfdm plugins --- obuspa/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/obuspa/Makefile b/obuspa/Makefile index 4a79ed56e..b1e4f8725 100644 --- a/obuspa/Makefile +++ b/obuspa/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=obuspa -PKG_VERSION:=7.0.4.8 +PKG_VERSION:=7.0.4.9 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -24,6 +24,7 @@ PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk +include ../bbfdm/bbfdm.mk define Package/obuspa SECTION:=utils @@ -92,7 +93,6 @@ define Package/obuspa/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/obuspa - $(INSTALL_DIR) $(1)/etc/bbfdm/json $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DIR) $(1)/etc/udhcpc.user.d $(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/ @@ -100,11 +100,11 @@ define Package/obuspa/install $(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/ $(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json $(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json - $(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json $(INSTALL_BIN) ./files/etc/uci-defaults/00-obuspa-extender-mode $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/uci-defaults/02-obuspa-dhcp-option $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user + $(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/USPAgent.json) ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y) $(INSTALL_BIN) ./files/etc/init.d/usptest $(1)/etc/init.d/ $(INSTALL_BIN) ./files/etc/uci-defaults/55-test-usp-controller $(1)/etc/uci-defaults/