From 2acea2c6dd4dc1500bd23fd899c051d4138a09bb Mon Sep 17 00:00:00 2001
From: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
Date: Tue, 28 Jan 2025 09:16:30 +0000
Subject: [PATCH] bbfdm: Introduce a new libbbfdm-api library version 2
---
bbfdm/Makefile | 19 +++++++++++++------
bbfdm/files/etc/config/bbfdm | 2 +-
bbfdm/files/etc/init.d/bbfdm.services | 2 +-
bbfdm/files/etc/init.d/bbfdmd | 2 +-
sysmngr/Makefile | 4 ++--
sysmngr/files/etc/config/sysmngr | 2 +-
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/bbfdm/Makefile b/bbfdm/Makefile
index ae52134a5..0f406788a 100644
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bbfdm
-PKG_VERSION:=1.13.6
+PKG_VERSION:=1.14.0
USE_LOCAL:=0
ifneq ($(USE_LOCAL),1)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=bfe8db9f6d5e8419c30da1e0ee36186e3f838f57
+PKG_SOURCE_VERSION:=b7e5e0de5a12340f3fa9c9e9e40915c4de79e8c5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=skip
endif
@@ -105,7 +105,8 @@ CMAKE_OPTIONS += \
define Package/libbbfdm-api/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
+ $(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/lib/
+ $(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/lib/
$(INSTALL_DIR) $(1)/usr/libexec/rpcd
$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
@@ -182,11 +183,17 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
+ $(INSTALL_DIR) $(1)/usr/include/libbbfdm-api/legacy
+ $(INSTALL_DIR) $(1)/usr/include/libbbfdm-api/version-2
$(INSTALL_DIR) $(1)/usr/include/libbbfdm-ubus
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/*.h $(1)/usr/include/libbbfdm-api/
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/*.h $(1)/usr/include/libbbfdm-api/legacy/
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/*.h $(1)/usr/include/libbbfdm-api/
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/*.h $(1)/usr/include/libbbfdm-api/version-2/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-ubus/bbfdm-ubus.h $(1)/usr/include/libbbfdm-ubus/
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
- $(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/usr/lib
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/include/*.h $(1)/usr/include/
+ $(CP) $(PKG_BUILD_DIR)/libbbfdm-api/legacy/libbbfdm-api.so $(1)/usr/lib
+ $(CP) $(PKG_BUILD_DIR)/libbbfdm-api/version-2/libbbfdm-api-v2.so $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/libbbfdm-ubus/libbbfdm-ubus.so $(1)/usr/lib
endef
diff --git a/bbfdm/files/etc/config/bbfdm b/bbfdm/files/etc/config/bbfdm
index 1d3e60cda..a0e44aa91 100644
--- a/bbfdm/files/etc/config/bbfdm
+++ b/bbfdm/files/etc/config/bbfdm
@@ -1,7 +1,7 @@
config bbfdmd 'bbfdmd'
option enable '1'
option debug '0'
- option loglevel '3'
+ option loglevel '4'
config micro_services 'micro_services'
option enable '1'
diff --git a/bbfdm/files/etc/init.d/bbfdm.services b/bbfdm/files/etc/init.d/bbfdm.services
index 95e7b5fad..5474d6f80 100644
--- a/bbfdm/files/etc/init.d/bbfdm.services
+++ b/bbfdm/files/etc/init.d/bbfdm.services
@@ -48,7 +48,7 @@ _add_microservice()
fi
json_select config
- json_get_var loglevel loglevel 3
+ json_get_var loglevel loglevel 4
procd_open_instance "${name}"
diff --git a/bbfdm/files/etc/init.d/bbfdmd b/bbfdm/files/etc/init.d/bbfdmd
index 39c3f3e72..e2daf50da 100644
--- a/bbfdm/files/etc/init.d/bbfdmd
+++ b/bbfdm/files/etc/init.d/bbfdmd
@@ -17,7 +17,7 @@ validate_bbfdm_bbfdmd_section()
uci_validate_section bbfdm bbfdmd "bbfdmd" \
'enable:bool:true' \
'debug:bool:false' \
- 'loglevel:uinteger:3'
+ 'loglevel:uinteger:4'
}
configure_bbfdmd()
diff --git a/sysmngr/Makefile b/sysmngr/Makefile
index ddc0d3652..57aafbd70 100644
--- a/sysmngr/Makefile
+++ b/sysmngr/Makefile
@@ -5,13 +5,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sysmngr
-PKG_VERSION:=1.0.15
+PKG_VERSION:=1.0.16
LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://dev.iopsys.eu/system/sysmngr.git
-PKG_SOURCE_VERSION:=3470caa72a1e2903e204e31ea0226e957cf25469
+PKG_SOURCE_VERSION:=7d5bf8e0751d3e2ec848b4da6e4a6c8366caf05c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=skip
endif
diff --git a/sysmngr/files/etc/config/sysmngr b/sysmngr/files/etc/config/sysmngr
index 65bc35ff5..4fdfbfd8d 100644
--- a/sysmngr/files/etc/config/sysmngr
+++ b/sysmngr/files/etc/config/sysmngr
@@ -1,6 +1,6 @@
config globals 'globals'
- option log_level '3'
+ option log_level '4'
config reboots 'reboots'
option max_reboot_entries '3'
--
GitLab