diff --git a/bridgemngr/Config.in b/bridgemngr/Config.in index 35bca4c05..0858e1295 100644 --- a/bridgemngr/Config.in +++ b/bridgemngr/Config.in @@ -1,7 +1,5 @@ if PACKAGE_bridgemngr -menu "Configuration" - config BRIDGEMNGR_BRIDGE_VLAN bool "Use bridge-vlan backend" help @@ -13,5 +11,7 @@ config BRIDGEMNGR_BRIDGE_VENDOR_EXT help Set this option to use bridge BBF vendor extensions. -endmenu +config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX + string "Package specific datamodel Vendor Prefix for TR181 extensions" + default "" endif diff --git a/bridgemngr/Makefile b/bridgemngr/Makefile index 7fc449c1e..ace7aa599 100644 --- a/bridgemngr/Makefile +++ b/bridgemngr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bridgemngr -PKG_VERSION:=1.0.10 +PKG_VERSION:=1.0.11 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) LOCAL_DEV:=0 @@ -40,7 +40,13 @@ endef MAKE_PATH:=src -TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\" +ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"") +VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX) +else +VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX) +endif + +TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\" ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y) TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND @@ -54,7 +60,7 @@ define Package/bridgemngr/install $(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME) ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y) $(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME) - $(BBFDM_INSTALL_MS_PLUGIN) ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME) + $(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME) endif $(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/