From 256b51c1ebd16866a621fc75c034203493807d3d Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 6 Aug 2026 09:47:33 +0200 Subject: [PATCH 1/8] ahcpd: add test-version.sh for CI runtime tests ahcpd does not provide any option to report its version, so the generic version check of the CI runtime tests always fails for this package. Override it by checking that the binary starts and prints its usage instead. Signed-off-by: Josef Schlehofer Co-authored-by: Claude Fable 5 --- ahcpd/test-version.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 ahcpd/test-version.sh diff --git a/ahcpd/test-version.sh b/ahcpd/test-version.sh new file mode 100644 index 000000000..130f48d0f --- /dev/null +++ b/ahcpd/test-version.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +ahcpd) + # ahcpd does not provide any option to report its version. + # Check that the binary starts and prints its usage instead. + ahcpd 2>&1 | grep -F "Syntax: ahcpd" + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From ca7eceeafcdd7c400512ab9aee1f304f9c6345c2 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 6 Aug 2026 09:47:33 +0200 Subject: [PATCH 2/8] babel-pinger: add test-version.sh for CI runtime tests babel-pinger does not provide any option to report its version, so the generic version check of the CI runtime tests always fails for this package. Skip the version check. Signed-off-by: Josef Schlehofer Co-authored-by: Claude Fable 5 --- babel-pinger/test-version.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 babel-pinger/test-version.sh diff --git a/babel-pinger/test-version.sh b/babel-pinger/test-version.sh new file mode 100644 index 000000000..4a5b9aeb8 --- /dev/null +++ b/babel-pinger/test-version.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +babel-pinger) + # babel-pinger does not provide any option to report its version + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From f91b3ecb5db9b8679be3de069477b3a5d6ff7085 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 6 Aug 2026 09:47:33 +0200 Subject: [PATCH 3/8] naywatch: add test-version.sh for CI runtime tests naywatch is a watchdog shell script which does not provide any option to report its version, so the generic version check of the CI runtime tests fails for this package. On top of that, the generic check executes each installed executable with several flags to probe for the version, which must never happen for a watchdog script that may trigger a reboot of the test environment. Providing a test-version.sh both skips the version probing of the binary and overrides the version check. Signed-off-by: Josef Schlehofer Co-authored-by: Claude Fable 5 --- naywatch/test-version.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 naywatch/test-version.sh diff --git a/naywatch/test-version.sh b/naywatch/test-version.sh new file mode 100644 index 000000000..6e435755c --- /dev/null +++ b/naywatch/test-version.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +naywatch) + # naywatch is a watchdog shell script which does not provide any + # option to report its version. It must not be executed during + # the CI runtime tests, since it may trigger a reboot. + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From 1f6e66bfd0aed117c39483bedf0744a8a3b933af Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 6 Aug 2026 09:47:33 +0200 Subject: [PATCH 4/8] ohybridproxy: add test-version.sh for CI runtime tests The package version is derived from PKG_SOURCE_DATE and the git hash, which neither ohybridproxy nor zonestitcher report, so the generic version check of the CI runtime tests always fails for these packages. Skip the version check. Signed-off-by: Josef Schlehofer Co-authored-by: Claude Fable 5 --- ohybridproxy/test-version.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 ohybridproxy/test-version.sh diff --git a/ohybridproxy/test-version.sh b/ohybridproxy/test-version.sh new file mode 100644 index 000000000..d9b50bc8e --- /dev/null +++ b/ohybridproxy/test-version.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +ohybridproxy|zonestitcher) + # The package version is derived from the source date and git + # hash, which the binaries do not report + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From ebf5db41b4a7d58af3fe4bdaf3679aa62d72ad9b Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 6 Aug 2026 09:47:33 +0200 Subject: [PATCH 5/8] pimbd: add test-version.sh for CI runtime tests The package version is derived from PKG_SOURCE_DATE and the git hash, which the binary does not report, so the generic version check of the CI runtime tests always fails for this package. Skip the version check. Signed-off-by: Josef Schlehofer Co-authored-by: Claude Fable 5 --- pimbd/test-version.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pimbd/test-version.sh diff --git a/pimbd/test-version.sh b/pimbd/test-version.sh new file mode 100644 index 000000000..b2ea8a24f --- /dev/null +++ b/pimbd/test-version.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +pimbd) + # The package version is derived from the source date and git + # hash, which the binary does not report + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From 2388b072458afe6dee130512fb2a04a8b4df2f43 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 6 Aug 2026 09:47:34 +0200 Subject: [PATCH 6/8] prince: add test-version.sh for CI runtime tests prince requires a configuration file and does not provide any option to report its version, so the generic version check of the CI runtime tests always fails for this package. Skip the version check. Signed-off-by: Josef Schlehofer Co-authored-by: Claude Fable 5 --- prince/test-version.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 prince/test-version.sh diff --git a/prince/test-version.sh b/prince/test-version.sh new file mode 100644 index 000000000..1d33a8a0d --- /dev/null +++ b/prince/test-version.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +prince) + # prince requires a configuration file and does not provide any + # option to report its version + exit 0 + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac From fbd3f447560dd1bf4c264fba49cad322401d5fd3 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 6 Aug 2026 11:34:32 +0200 Subject: [PATCH 7/8] ohybridproxy: refresh CMake 4.0 patch The patch carried the raw `git format-patch` output including the "diff --git"/"index" lines and the trailing git version signature, which the refresh check of the CI strips, so any PR touching this package failed with: Dirty patches detected, please refresh and review the diff Normalize the patch to the refreshed form. No content change. Signed-off-by: Josef Schlehofer Co-authored-by: Claude Fable 5 --- .../patches/100-CMakeLists-support-CMake-4.0-version.patch | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ohybridproxy/patches/100-CMakeLists-support-CMake-4.0-version.patch b/ohybridproxy/patches/100-CMakeLists-support-CMake-4.0-version.patch index 72e8bb423..59f7efa88 100644 --- a/ohybridproxy/patches/100-CMakeLists-support-CMake-4.0-version.patch +++ b/ohybridproxy/patches/100-CMakeLists-support-CMake-4.0-version.patch @@ -10,8 +10,6 @@ Signed-off-by: Christian Marangi CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1c970d9..cfb878e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ @@ -20,6 +18,3 @@ index 1c970d9..cfb878e 100644 project(ohybridproxy C) set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") --- -2.51.0 - From a71da5ecaebcfa69a6909c670a5d6374ab4025d0 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 6 Aug 2026 14:13:40 +0200 Subject: [PATCH 8/8] naywatch: correct the reason recorded in test-version.sh The comment claimed the version check has to be skipped because running the script may trigger a reboot. That is not what happens: reboot_now() is only reached once naywatch has seen a neighbour (ACTIVE=1) and then lost it for more than MIN_KICK intervals, and the watchdog branch is not taken either, because the probe leaves use_watchdog empty. What does happen is that naywatch takes positional arguments - check interval, watchdog timeout, and so on - rather than options, so a probe flag ends up as the check interval and the script enters its monitoring loop instead of reporting anything, until the probe timeout kills it. The override stays, only its justification is corrected. Signed-off-by: Josef Schlehofer Co-authored-by: Claude Fable 5 --- naywatch/test-version.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/naywatch/test-version.sh b/naywatch/test-version.sh index 6e435755c..d8b577e42 100644 --- a/naywatch/test-version.sh +++ b/naywatch/test-version.sh @@ -4,9 +4,11 @@ case "$PKG_NAME" in naywatch) - # naywatch is a watchdog shell script which does not provide any - # option to report its version. It must not be executed during - # the CI runtime tests, since it may trigger a reboot. + # naywatch takes positional arguments (check interval, watchdog + # timeout, ...), not options, so a probe flag ends up as the + # check interval and the script enters its monitoring loop + # instead of reporting anything, until the probe timeout kills + # it. exit 0 ;;