bbfdm: 1.0.1

bbfdm/Makefile

@@ -5,24 +5,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=0a4105c931f2cba8fec2ffdc813f170903ea3e90
+PKG_SOURCE_VERSION:=3cb2e902ba5d4ee33800910bab86a266170d7e88
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-define Package/libbbf_api
+define Package/libbbfdm-api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
@@ -31,42 +31,42 @@ define Package/libbbf_api
   ABI_VERSION:=1.0
 endef
 
-define Package/libbbf_dm/default
+define Package/libbbfdm/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbf_api \
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
 	    +BBF_TR471:obudpst
 endef
 
-define Package/libbbf_dm
-  $(Package/libbbf_dm/default)
+define Package/libbbfdm
+  $(Package/libbbfdm/default)
   TITLE += (internal)
   VARIANT:=internal
 endef
 
-define Package/libbbf_dm-mbedtls
-  $(Package/libbbf_dm/default)
+define Package/libbbfdm-mbedtls
+  $(Package/libbbfdm/default)
   TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_libbbf_dm-mbedtls:libmbedtls
+  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
   VARIANT:=mbedtls
   DEFAULT_VARIANT:=1
 endef
 
-define Package/libbbf_dm-openssl
-  $(Package/libbbf_dm/default)
+define Package/libbbfdm-openssl
+  $(Package/libbbfdm/default)
   TITLE += (openssl)
-  DEPENDS += +PACKAGE_libbbf_dm-openssl:libopenssl
-  CONFLICTS := libbbf_dm-mbedtls
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  CONFLICTS := libbbfdm-mbedtls
   VARIANT:=openssl
 endef
 
-define Package/libbbf_dm-wolfssl
-  $(Package/libbbf_dm/default)
+define Package/libbbfdm-wolfssl
+  $(Package/libbbfdm/default)
   TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_libbbf_dm-wolfssl:libwolfssl
-  CONFLICTS := libbbf_dm-mbedtls libbbf_dm-openssl
+  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
+  CONFLICTS := libbbfdm-mbedtls libbbfdm-openssl
   VARIANT:=wolfssl
 endef
 
@@ -75,8 +75,8 @@ define Package/bbfdmd
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbf_api +PACKAGE_libbbf_dm-mbedtls:libbbf_dm-mbedtls \
-  		   +PACKAGE_libbbf_dm-openssl:libbbf_dm-openssl +PACKAGE_libbbf_dm-wolfssl:libbbf_dm-wolfssl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +PACKAGE_libbbfdm-mbedtls:libbbfdm-mbedtls \
+  		   +PACKAGE_libbbfdm-openssl:libbbfdm-openssl +PACKAGE_libbbfdm-wolfssl:libbbfdm-wolfssl
 endef
 
 define Package/userinterface
@@ -90,15 +90,15 @@ define Package/userinterface/description
   Package to add Device.UserInterface. datamodel support
 endef
 
-define Package/libbbf_dm/config
+define Package/libbbfdm/config
 	source "$(SOURCE)/Config_bbfdm.in"
 endef
 
-define Package/libbbf_api/description
- Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbf_dm
+define Package/libbbfdm-api/description
+ Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
 
-define Package/libbbf_dm/description
+define Package/libbbfdm/description
  Library contains the data model tree. It includes TR181, TR104 and TR143 data models
 endef
 
@@ -166,22 +166,22 @@ CMAKE_OPTIONS += \
 	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
 endif
 
-define Package/libbbf_api/install
+define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbf_api/libbbf_api.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
 endef
 
-define Package/libbbf_dm/default/install
+define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(CP) $(PKG_BUILD_DIR)/libbbf_dm/libbbf_dm.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
 ifeq ($(CONFIG_BBF_TR143),y)
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbf_dm/scripts/* $(1)/usr/share/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
 	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
 endif
 ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
@@ -192,7 +192,7 @@ ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
 endif
 endef
 
-define Package/libbbf_dm/default/prerm
+define Package/libbbfdm/default/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
@@ -203,7 +203,7 @@ define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
-	$(INSTALL_CONF) ./files/etc/config/bbfdmd $(1)/etc/config/bbfdmd
+	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/src/bbfdmd $(1)/usr/sbin/
 endef
 
@@ -220,32 +220,32 @@ define Package/userinterface/install
 	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
 endef
 
-Package/libbbf_dm-openssl/prerm = $(Package/libbbf_dm/default/prerm)
-Package/libbbf_dm-wolfssl/prerm = $(Package/libbbf_dm/default/prerm)
-Package/libbbf_dm-mbedtls/prerm = $(Package/libbbf_dm/default/prerm)
+Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
 
-Package/libbbf_dm-openssl/install = $(Package/libbbf_dm/default/install)
-Package/libbbf_dm-wolfssl/install = $(Package/libbbf_dm/default/install)
-Package/libbbf_dm-mbedtls/install = $(Package/libbbf_dm/default/install)
+Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libbbf_dm
-	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/include/*.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_dm/dmtree/tr181/device.h $(1)/usr/include/libbbf_dm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_dm/dmtree/vendor/vendor.h $(1)/usr/include/libbbf_dm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(CP) $(PKG_BUILD_DIR)/libbbf_dm/libbbf_dm.so $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/libbbf_api/libbbf_api.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libbbf_api))
-$(eval $(call BuildPackage,libbbf_dm))
-$(eval $(call BuildPackage,libbbf_dm-openssl))
-$(eval $(call BuildPackage,libbbf_dm-wolfssl))
-$(eval $(call BuildPackage,libbbf_dm-mbedtls))
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/tr181/device.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/vendor.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libbbfdm-api))
+$(eval $(call BuildPackage,libbbfdm))
+$(eval $(call BuildPackage,libbbfdm-openssl))
+$(eval $(call BuildPackage,libbbfdm-wolfssl))
+$(eval $(call BuildPackage,libbbfdm-mbedtls))
 
 $(eval $(call BuildPackage,bbfdmd))
 $(eval $(call BuildPackage,userinterface))

bbfdm/files/etc/config/bbfdmd

-
-config globals 'globals'
-	option loglevel '1'
-	option refresh_time '10'
-	option transaction_timeout '10'
-

bbfdm/files/etc/init.d/bbfdmd

@@ -10,9 +10,9 @@ log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
 }
 
-validate_bbfdmd_globals_section()
+validate_bbfdm_bbfdmd_section()
 {
-	uci_validate_section bbfdmd globals "globals" \
+	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enabled:bool:true' \
 		'debug:bool:false' \
 		'loglevel:uinteger' \
@@ -24,10 +24,10 @@ configure_bbfdmd()
 {
 	local enabled debug sock transaction_timeout
 
-	config_load bbfdmd
+	config_load bbfdm
 
-	validate_bbfdmd_globals_section || {
-		log "Validation of bbf section failed"
+	validate_bbfdm_bbfdmd_section || {
+		log "Validation of bbfdmd section failed"
 		return 1;
 	}