From fc2b5a23808ae662f06d60fbee11a6424da0e4b9 Mon Sep 17 00:00:00 2001 From: Amin Ben Romdhane Date: Fri, 17 Jan 2025 10:38:09 +0100 Subject: [PATCH] bbfdm: Delete OUT_NAME option as it is no longer in use --- bbfdm/bbfdm.mk | 1 - bbfdm/tools/bbfdm.sh | 4 ---- netmngr/Makefile | 2 +- wifidmd/Makefile | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bbfdm/bbfdm.mk b/bbfdm/bbfdm.mk index 2b852ce85..dfb0e3d80 100644 --- a/bbfdm/bbfdm.mk +++ b/bbfdm/bbfdm.mk @@ -47,7 +47,6 @@ BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p # Note: # - There could be only one main plugin file, so its bind to PKG_NAME # - Micro-service input.json will be auto generated with this call -# - Use -u (optional argument) to overwrite ubus object name # # Example: # BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME) diff --git a/bbfdm/tools/bbfdm.sh b/bbfdm/tools/bbfdm.sh index 2fbed70e3..d7babb1d8 100755 --- a/bbfdm/tools/bbfdm.sh +++ b/bbfdm/tools/bbfdm.sh @@ -2,7 +2,6 @@ BBFDM_BASE_DM_PATH="usr/share/bbfdm" BBFDM_INPUT_PATH="etc/bbfdm/micro_services" -OUT_NAME="" INPUT_FILE="0" MICRO_SERVICE=0 @@ -30,9 +29,6 @@ while getopts ":mpsdtu:" opt; do t) INPUT_FILE=1 ;; - u) - OUT_NAME="${OPTARG}" - ;; ?) echo "Invalid option: ${OPTARG}" exit 1 diff --git a/netmngr/Makefile b/netmngr/Makefile index eca884a82..d6e224e0e 100644 --- a/netmngr/Makefile +++ b/netmngr/Makefile @@ -39,7 +39,7 @@ TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\" define Package/netmngr/install $(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME) - $(BBFDM_INSTALL_MS_DM) -u Network $(PKG_BUILD_DIR)/src/libnetmngr.so $(1) $(PKG_NAME) + $(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libnetmngr.so $(1) $(PKG_NAME) $(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/src/libinterface_stack.so $(1) endef diff --git a/wifidmd/Makefile b/wifidmd/Makefile index df4edafbf..fa6e1e0b8 100644 --- a/wifidmd/Makefile +++ b/wifidmd/Makefile @@ -41,7 +41,7 @@ MAKE_PATH:=src define Package/wifidmd/install $(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME) - $(BBFDM_INSTALL_MS_DM) -u WiFi $(PKG_BUILD_DIR)/src/libwifi.so $(1) $(PKG_NAME) + $(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libwifi.so $(1) $(PKG_NAME) ifeq ($(CONFIG_ENABLE_WIFI_DATAELEMENTS),y) $(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libdataelements.so $(1) $(PKG_NAME) endif