From 7572e4eb1eb5838562436562cdee182911e7313e Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Tue, 16 Apr 2024 17:58:11 +0530 Subject: [PATCH] tr104: align with bbfdm --- tr104/Makefile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tr104/Makefile b/tr104/Makefile index 521a139f4..cf34d3640 100644 --- a/tr104/Makefile +++ b/tr104/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tr104 -PKG_VERSION:=1.0.24 +PKG_VERSION:=1.0.25 LOCAL_DEV:=0 ifeq ($(LOCAL_DEV),0) @@ -70,19 +70,22 @@ endif define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DIR) $(1)/etc/tr104/plugins/ $(INSTALL_DIR) $(1)/etc/uci-defaults/ - $(call BbfdmInstallPluginInMicroservice,$(1)/etc/tr104,$(PKG_BUILD_DIR)/libdm/tr104/libtr104.so) -ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y) - $(call BbfdmInstallPluginInMicroservice,$(1)/etc/tr104/plugins,$(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so) -endif ifeq ($(CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE),y) - $(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/tr104/input.json) + $(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1) $(PKG_NAME) +ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y) + $(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1) $(PKG_NAME) +endif else - $(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/ubus/tr104d $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/tr104/plugins/ + $(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json $(INSTALL_BIN) ./files/etc/init.d/tr104d $(1)/etc/init.d/tr104d + $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/ubus/tr104d $(1)/usr/sbin/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1)/etc/tr104 +ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1)/etc/tr104/plugins +endif endif endef