diff --git a/bbfdm/Makefile b/bbfdm/Makefile index ae52134a56d839c78ea98e7eb6ef9fd3a1f2761b..0f406788a5b048c9b37fc5b06b9f8e23e7877355 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 1d3e60cdad85cb54077b9e89605fb11bc8d19929..a0e44aa91480bd5a05132623fa9d1a4ecc9984dc 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 95e7b5fadc793fe9b9d722c234df592c1a229d30..5474d6f802fc2d9631f123ffe61a6c762b51338f 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 39c3f3e724fb21a4a5f1d4d02e6ee54e7df41950..e2daf50da2b775eadb6a64c58da10a6b8cf32f16 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 ddc0d3652291d4aa4a2ab83c3e423086f1de6b5a..57aafbd70beb4ee8d8109e1e57bc7b0063665cc7 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 65bc35ff5eee6780223769711a9e2e7647545a2e..4fdfbfd8d44abec65a6d9a3dc1fb8a18c7382e34 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'