bbfdm: 1.15.8

- Added a config option to force recompile of datamodel microservices
- Use service_name from service json for registration
This commit is contained in:
Vivek Kumar Dutta 2025-03-12 18:27:42 +05:30
parent 89b2c6ab19
commit 943667adc6
No known key found for this signature in database
GPG key ID: 4E09F5AD8265FD4C
3 changed files with 15 additions and 4 deletions

View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=bbfdm PKG_NAME:=bbfdm
PKG_VERSION:=1.15.7 PKG_VERSION:=1.15.8
USE_LOCAL:=0 USE_LOCAL:=0
ifneq ($(USE_LOCAL),1) ifneq ($(USE_LOCAL),1)
@ -70,6 +70,15 @@ define Package/bbfdmd/config
source "$(SOURCE)/Config_bbfdmd.in" source "$(SOURCE)/Config_bbfdmd.in"
endef endef
# Below config is a hack to force-recompile dependent micro-services
define Package/libbbfdm-api/config
if PACKAGE_bbfdmd
config BBF_LIBBBFDM_VERSION
string "Internal config variable to force recompile"
default "v${PKG_VERSION}"
endif
endef
define Package/libbbfdm-api/description define Package/libbbfdm-api/description
Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
endef endef

View file

@ -6,6 +6,7 @@ BBFDM_BASE_DM_PATH=/usr/share/bbfdm
BBFDM_INPUT_PATH=/etc/bbfdm/micro_services BBFDM_INPUT_PATH=/etc/bbfdm/micro_services
BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
PKG_CONFIG_DEPENDS += CONFIG_BBF_LIBBBFDM_VERSION
#BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile) #BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile)
#BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools #BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools

View file

@ -148,8 +148,9 @@ if [ "${INPUT_FILE}" -eq "1" ]; then
exit 1 exit 1
fi fi
if [ -z "${DATA}" ]; then service_name="$(cat ${SRC}|jq -r '.daemon.service_name')"
echo "# Package name not provided ...." if [ -z "${service_name}" ]; then
echo "# service_name not defined in service json ...."
exit 1 exit 1
fi fi
@ -160,7 +161,7 @@ if [ "${INPUT_FILE}" -eq "1" ]; then
fi fi
install_dir ${DEST}/etc/bbfdm/services install_dir ${DEST}/etc/bbfdm/services
install_data ${tempfile} ${DEST}/etc/bbfdm/services/${DATA}.json install_data ${tempfile} ${DEST}/etc/bbfdm/services/${service_name}.json
if [ -f "${tempfile}" ]; then if [ -f "${tempfile}" ]; then
rm ${tempfile} rm ${tempfile}