Merge branch 'reset_reason' into 'devel'

Reset reason See merge request feed/iopsys!1933
quickjs: added fPIC flag
2025-12-20 01:20:35 +08:00 · 2025-12-19 20:25:01 +05:30 · 2025-12-19 18:51:37 +05:30 · 2025-12-19 13:22:01 +01:00 · 2025-12-19 16:56:58 +05:30 · 2025-12-18 16:30:00 +01:00
9 changed files with 56 additions and 12 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.18.17
+PKG_VERSION:=1.18.18

 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=df25ff7ce0e42ea6a489cff2386774887a7dbd37
+PKG_SOURCE_VERSION:=fbf01a9e30e7ecccc2453af7abfbccf939e27d43
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif
--- a/decollector/Makefile
+++ b/decollector/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=decollector
-PKG_VERSION:=6.2.3.8
+PKG_VERSION:=6.2.3.9

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8396091a83aefaf8423dfd41a957b04f3ed821e7
+PKG_SOURCE_VERSION:=d1d948a48952fe2091e84af1293a6e77857439cf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=6.5.0.9
+PKG_VERSION:=6.5.0.10
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f4d201acde3320b1019c1831315e58a8ecb0290c
+PKG_SOURCE_VERSION:=1a9763bd4e520975e6951f77e85f369487cf1318
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 PKG_LICENSE:=BSD-3-Clause
--- a/obudpst/patches/500-cmake-fix-compatibility-with-CMake-4.patch
+++ b/obudpst/patches/500-cmake-fix-compatibility-with-CMake-4.patch
@@ -0,0 +1,31 @@
+From dac144fb25e4aaaf4e965f066113dc265d0ee524 Mon Sep 17 00:00:00 2001
+From: Andreas Gnau <andreas.gnau@iopsys.eu>
+Date: Mon, 15 Dec 2025 09:02:10 +0100
+Subject: [PATCH] cmake: fix compatibility with CMake 4
+
+CMake 4 has dropped compatibility with old versions < 3.5, and will drop
+compatibility for < 3.10 in the future. Update the minimum required
+CMake version accordingly so that both old and new versions will work.
+
+Upstream-Status: Submitted [https://github.com/BroadbandForum/obudpst/pull/23]
+Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83bee0290741..cb66227aa62f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -27,7 +27,7 @@
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ project(OB-UDPST)
+-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0...3.10)
+ if(${CMAKE_VERSION} VERSION_GREATER "3.3.0")
+         cmake_policy(SET CMP0057 NEW)
+ endif()
+-- 
+2.52.0
+
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=10.0.7.10
+PKG_VERSION:=10.0.7.11

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=c3b7c7653edb63326e7070b6891a95ad6cf7a2ee
+PKG_SOURCE_VERSION:=1594e87bdb9481e6aa4f4cfbe7d975d2094713e6
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
--- a/quickjs/Makefile
+++ b/quickjs/Makefile
@@ -35,6 +35,10 @@ MAKE_FLAGS = \
 	EXTRA_LIBS="-latomic" \
 	CROSS_PREFIX="$(TARGET_CROSS)"

+# Ensure the static library is built with position independent code so it can
+# be linked into shared objects.
+TARGET_CFLAGS += -fPIC
+
 define Build/Compile
 	# The upstream Makefile uses the same CFLAGS for host and target builds,
 	# which breaks cross-compilation. We work around this by first building
--- a/rulengd/Makefile
+++ b/rulengd/Makefile
@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
 PKG_SOURCE_VERSION:=a19175a70da42d57e76aac167c9a1f4cab3a94c6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
-PKG_MIRROR_HASH:=efaa333e62c1a47814fcee8cd6694cc5fda2ab8be91d46c435346d8c6f1a2f11
+PKG_MIRROR_HASH:=skip
 endif

 PKG_LICENSE:=GPL-2.0-only
--- a/sysmngr/files/etc/init.d/sysmngr
+++ b/sysmngr/files/etc/init.d/sysmngr
@@ -1,10 +1,19 @@
 #!/bin/sh /etc/rc.common

-START=15
+START=12
 STOP=8

 USE_PROCD=1
 PROG=/usr/sbin/sysmngr
+RESET_REASON="/etc/sysmngr/reset_reason"
+
+boot()
+{
+	if [ -x "${RESET_REASON}" ]; then
+		eval ${RESET_REASON}
+	fi
+	start
+}

 start_service()
 {
--- a/wifidmd/Makefile
+++ b/wifidmd/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifidmd
-PKG_VERSION:=1.4.8
+PKG_VERSION:=1.4.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=f21247fb72f9cdcbaa63a7de6281b0b12a9d632f
+PKG_SOURCE_VERSION:=28eac5bf52c16b71213974e15cd9c559b61e1c5d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif
Author	SHA1	Message	Date
Vivek Dutta	fd2eea4d8d	Merge branch 'reset_reason' into 'devel' Reset reason See merge request feed/iopsys!1933	2025-12-19 20:25:01 +05:30
Xiaofeng Meng	dc670b2621	quickjs: added fPIC flag	2025-12-19 18:51:37 +05:30
Amin Ben Romdhane	83a5721b93	bbfdm: 1.18.18	2025-12-19 13:22:01 +01:00
Vivek Kumar Dutta	41f26348b9	obuspa: Fix compatibility with CMake4	2025-12-19 16:56:58 +05:30
Jakob Olsson	e36012bcc7	map-agent: 6.5.0.10	2025-12-18 16:30:00 +01:00
Andreas Gnau	c2f1103417	rulengd: Set PKG_MIRROR_HASH:=skip There are differences in tar generation between OpenWrt 23.05 and 25.12. This hash had been added automatically by the version-bump script update_git_source_package.sh from maintainer-tools. This causes the build to fail on later OpenWrt versions such as 25.12. For now, skip hash verification. Once we have moved to 25. For now, we have multiple choices: * backport changes done to tarball generation to 23.05-based OpenWrt branch * only update hashes using OpenWrt 25.12 based branch (23.05-based branch will happily ignore and redownload in such cases, which is not an issue as long as we do not upload those tarballs * use skip for now and do not use bump-script from OpenWrt and only adopt using proper hashes when we have moved to OpenWrt 25.12 Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>	2025-12-18 14:10:58 +01:00
Andreas Gnau	248c8fe510	obudpst: fix compatibility with CMake 4 CMake 4 has dropped compatibility with old versions < 3.5, and will drop compatibility for < 3.10 in the future. Update the minimum required CMake version accordingly. Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>	2025-12-18 13:01:43 +01:00
Amin Ben Romdhane	c61e80db94	decollector: 6.2.3.9	2025-12-18 12:37:50 +01:00
Amin Ben Romdhane	d7fe821608	wifidmd: 1.4.9	2025-12-18 10:59:42 +01:00
Vivek Kumar Dutta	b087faf6b9	sysmngr: run reset_reason if present	2025-11-18 12:50:34 +05:30