bbfdm: 1.14.4

- Fix kill sequence of bbfdm services
- Removed support of BBF_CONFIGMNGR_SCRIPT_BACKEND
- Removed support of BBF_MAX_OBJECT_INSTANCES
- Enabled debug release

bbfdm/Config_bbfdmd.in

@@ -7,8 +7,4 @@ config BBF_VENDOR_PREFIX
 config BBF_OBFUSCATION_KEY
 	string "Obfuscation key"
 	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
-
-config BBF_MAX_OBJECT_INSTANCES
-	int "Maximum number of instances per object"
-	default 255
 endif

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.14.3
+PKG_VERSION:=1.14.4
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=31d8d5d28eff2153a1425f3a8e51e7b45e3e2441
+PKG_SOURCE_VERSION:=c8967d6bf47c8bc96cf8df94236b4edfc95aabea
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -19,6 +19,8 @@ endif
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
+RSTRIP:=true
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include bbfdm.mk
@@ -68,10 +70,6 @@ define Package/bbfdmd/config
 	source "$(SOURCE)/Config_bbfdmd.in"
 endef
 
-define Package/bbf_configmngr/config
-	source "$(SOURCE)/bbf_configmngr.in"
-endef
-
 define Package/libbbfdm-api/description
  Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
@@ -100,8 +98,9 @@ endif
 
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES) \
+	-DBBFDMD_MAX_MSG_LEN:Integer=10485760 \
-	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
+	-DCMAKE_BUILD_TYPE:String="Debug" \
+
 
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
@@ -134,6 +133,7 @@ define Package/bbfdmd/install
 
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
+	$(STRIP) $(1)/usr/sbin/bbfdmd
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
@@ -159,17 +159,14 @@ endef
 define Package/bbf_configmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/bbfdm/
-ifeq ($(CONFIG_BBF_CONFIGMNGR_C_BACKEND),y)
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
+
-endif
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
-ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
+	$(STRIP) $(1)/usr/sbin/bbf_configd
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+
-	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.config $(1)/usr/libexec/rpcd/bbf.config
+	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
-endif
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_config_notify.sh $(1)/usr/share/bbfdm/scripts/
 	$(INSTALL_DATA) ./files/etc/bbfdm/critical_services.json $(1)/etc/bbfdm/
 endef
 

bbfdm/bbf_configmngr.in

@@ -1,19 +0,0 @@
-if PACKAGE_bbf_configmngr
-choice
-	prompt "Select backend daemon for bbf.config"
-	default BBF_CONFIGMNGR_C_BACKEND
-	help
-		Select which backend daemon should be used for ubus bbf.config
-
-config BBF_CONFIGMNGR_SCRIPT_BACKEND
-	bool "Use shell script backend"
-	help
-		Enable this option to use shell script as the backend for bbf.config. This can be useful for quick and easy scripting of configuration tasks.
-
-config BBF_CONFIGMNGR_C_BACKEND
-	bool "Use C code backend"
-	help
-		Enable this option to use a C code implementation as the backend for bbf.config. This option is generally preferred for performance-critical tasks and scenarios requiring more robust and efficient handling.
-
-endchoice
-endif

bbfdm/files/etc/init.d/bbf_configd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=80
-STOP=10
+STOP=07
 
 USE_PROCD=1
 PROG=/usr/sbin/bbf_configd

bbfdm/files/etc/init.d/bbfdm.services

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=60
-STOP=8
+STOP=05
 
 USE_PROCD=1
 PROG=/usr/sbin/dm-service

bbfdm/files/etc/init.d/bbfdmd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=97
-STOP=10
+STOP=06
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd