diff --git a/parental-control/Config.in b/parental-control/Config.in index f38355e62..e5d46422b 100644 --- a/parental-control/Config.in +++ b/parental-control/Config.in @@ -1,7 +1,5 @@ if PACKAGE_parental-control -menu "Configuration" - config PARENTAL_CONTROL_INCLUDE_URLFILTER_BUNDLES bool "Include default bundle files" default n @@ -9,5 +7,8 @@ config PARENTAL_CONTROL_INCLUDE_URLFILTER_BUNDLES Set this option to include bundle files by default, they are also included in the UCI, urlfilter still needs to be enabled though. -endmenu + +config PARENTAL_CONTROL_VENDOR_PREFIX + string "Package specific datamodel Vendor Prefix for TR181 extensions" + default "" endif diff --git a/parental-control/Makefile b/parental-control/Makefile index 3779066b8..17ae5cafc 100644 --- a/parental-control/Makefile +++ b/parental-control/Makefile @@ -39,9 +39,15 @@ define Package/$(PKG_NAME)/config source "$(SOURCE)/Config.in" endef -TARGET_CFLAGS += \ - -D_GNU_SOURCE\ - -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\" +TARGET_CFLAGS += -D_GNU_SOURCE + +ifeq ($(CONFIG_PARENTAL_CONTROL_VENDOR_PREFIX),"") +VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX) +else +VENDOR_PREFIX = $(CONFIG_PARENTAL_CONTROL_VENDOR_PREFIX) +endif + +TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\" TARGET_LDFLAGS += \ -lcmph @@ -71,7 +77,8 @@ define Package/parental-control/install $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DATA) ./files/etc/uci-defaults/95-firewall_parentalcontrol.ucidefaults $(1)/etc/uci-defaults/ $(INSTALL_DATA) ./files/etc/uci-defaults/95-migrate_urlfilter.ucidefaults $(1)/etc/uci-defaults/ - $(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) parentalcontrol + + $(BBFDM_REGISTER_SERVICES) -v ${VENDOR_PREFIX} ./bbfdm_service.json $(1) parentalcontrol ifeq ($(CONFIG_PARENTAL_CONTROL_INCLUDE_URLFILTER_BUNDLES),y) $(INSTALL_DIR) $(1)/etc/parental-control