diff --git a/batctl/Makefile b/batctl/Makefile index 7491a35fe..a27b5983d 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -4,12 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl PKG_VERSION:=2025.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) PKG_HASH:=566aa4fd74355e8d5dd2bd21c25e98cc068e77fd08e19f80b8e2b5edde7c8e65 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Simon Wunderlich PKG_LICENSE:=GPL-2.0-only ISC MIT @@ -29,7 +28,7 @@ define Package/batctl/Default endef define Package/batctl/description - batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced. + batctl is a more intuitive management utility for B.A.T.M.A.N.-Advanced. It is an easier method for configuring batman-adv and provides some additional tools for debugging as well. This package builds version $(PKG_VERSION) of the user space utility. @@ -72,11 +71,11 @@ $(Package/batctl/description) endef MAKE_VARS += \ - LIBNL_NAME="libnl-tiny" \ - LIBNL_GENL_NAME="libnl-tiny" + LIBNL_NAME="libnl-tiny" \ + LIBNL_GENL_NAME="libnl-tiny" MAKE_FLAGS += \ - REVISION="$(PKG_VERSION)-openwrt-$(PKG_RELEASE)" + REVISION="$(PKG_VERSION)-openwrt-$(PKG_RELEASE)" config-n := \ aggregation \ @@ -214,17 +213,9 @@ config-y := \ endif -define ConfigVars -$(subst $(space),,$(foreach opt,$(config-$(1)),CONFIG_$(opt)=$(1) -)) -endef - -define batctl_config -$(call ConfigVars,n)$(call ConfigVars,y) -endef -$(eval $(call shexport,batctl_config)) - -MAKE_FLAGS += $$$$$(call shvar,batctl_config) +MAKE_FLAGS += \ + $(patsubst %,CONFIG_%=n,$(config-n)) \ + $(patsubst %,CONFIG_%=y,$(config-y)) define Package/batctl-tiny/install $(INSTALL_DIR) $(1)/usr/libexec diff --git a/batman-adv/Makefile b/batman-adv/Makefile index b56055672..af28a3c29 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2025.4 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) @@ -52,10 +52,6 @@ define KernelPackage/batman-adv/config source "$(SOURCE)/Config.in" endef -define Package/kmod-batman-adv/conffiles -/etc/config/batman-adv -endef - PKG_EXTRA_KCONFIG:= \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_BATMAN_ADV_DEBUG),y,n) \ diff --git a/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif b/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif index c74b7f9c6..509374a92 100755 --- a/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif +++ b/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif @@ -17,7 +17,7 @@ proto_batadv_to_batadv_hardif() { config_get routing_algo "${section}" routing_algo if [ -z "$mesh" -o "${proto}" != "batadv" ]; then - continue + return fi uci set network."${section}".proto="batadv_hardif" diff --git a/mesh11sd/Makefile b/mesh11sd/Makefile index f7e3543d1..beaea3bd5 100644 --- a/mesh11sd/Makefile +++ b/mesh11sd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mesh11sd PKG_VERSION:=6.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Rob White PKG_LICENSE:=GPL-2.0-only diff --git a/mesh11sd/patches/100-skip-runtime-setup-for-informational-options.patch b/mesh11sd/patches/100-skip-runtime-setup-for-informational-options.patch new file mode 100644 index 000000000..c7234e7b6 --- /dev/null +++ b/mesh11sd/patches/100-skip-runtime-setup-for-informational-options.patch @@ -0,0 +1,51 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Josef Schlehofer +Date: Thu, 6 Aug 2026 13:00:00 +0200 +Subject: [PATCH] mesh11sd: skip the environment setup for the informational + options + +get_current_setup() runs before any argument is parsed, so mesh11sd -v +and mesh11sd -h collect the whole runtime environment first. That +includes refresh_bridgemac(), which calls wait_for_interface() for +br-lan; when that interface is not up, the poll loop runs for the full +interface_timeout, ten seconds by default. + +On a running router br-lan is up, the loop exits on its first iteration +and the delay is invisible. It shows up wherever the interface is +absent or still coming up, such as the OpenWrt package CI: it probes +every installed executable for its version with a ten second timeout, +so each probe was killed before mesh11sd printed anything. + +The informational branches reference only $version and $tmpdir, and +both already hold a value before the setup pass, so it can be skipped +for them. The one visible consequence is that the help text now names +the initial /tmp/mesh11sd rather than $log_mountpoint/mesh11sd, which +get_current_setup() would have assigned on a node that configures +log_mountpoint elsewhere. + +Upstream-Status: Denied [https://github.com/openNDS/mesh11sd/pull/204] +Closed in favour of an upstream change that moves the +get_current_setup() call after the version and help handling. That +change is in the private 7.2.0 beta and is expected in the 7.2.0 +release; drop this patch once the package is bumped to it. + +Signed-off-by: Josef Schlehofer +--- + src/mesh11sd | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/src/mesh11sd ++++ b/src/mesh11sd +@@ -5976,7 +5976,11 @@ else + mesh11sdpid=$(pgrep -f "/bin/sh /usr/sbin/mesh11sd") + fi + +-get_current_setup 2> /dev/null ++# Skip the expensive runtime setup for informational options. ++case "$1" in ++ ""|-h|--help|help|-v|--version|version) ;; ++ *) get_current_setup 2> /dev/null ;; ++esac + + if [ -z "$1" ] || [ "$1" = "-h" ] || [ $1 = "--help" ] || [ $1 = "help" ]; then + echo " diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile index 09a81310f..8102f0a96 100644 --- a/nodogsplash/Makefile +++ b/nodogsplash/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nodogsplash PKG_VERSION:=5.0.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/nodogsplash/nodogsplash/tar.gz/v$(PKG_VERSION)? diff --git a/nodogsplash/files/etc/init.d/nodogsplash b/nodogsplash/files/etc/init.d/nodogsplash index 4af51ca24..8b186486c 100755 --- a/nodogsplash/files/etc/init.d/nodogsplash +++ b/nodogsplash/files/etc/init.d/nodogsplash @@ -119,7 +119,7 @@ generate_uci_config() { config_get val "$cfg" config if [ -n "$val" ]; then if [ ! -f "$val" ]; then - echo "Configuration file '$file' doesn't exist." >&2 + echo "Configuration file '$val' doesn't exist." >&2 return 1 fi addline "$(cat $val)" @@ -142,7 +142,7 @@ generate_uci_config() { addline "GatewayInterface $ifname" for option in preauth binauth \ - daemon debuglevel maxclients gatewayname gatewayinterface gatewayiprange \ + daemon debuglevel maxclients gatewayname gatewayiprange \ gatewayaddress gatewayport webroot splashpage statuspage \ redirecturl sessiontimeout preauthidletimeout authidletimeout checkinterval \ setmss mssvalue trafficcontrol downloadlimit uploadlimit \ @@ -158,7 +158,7 @@ generate_uci_config() { for option in fasport fasremoteip faspath fas_secure_enabled ; do config_get val "$cfg" "$option" if [ -n "$val" ]; then - echo "Warning: nodogsplash does not support $val" + echo "Warning: nodogsplash does not support $option" return 1 fi done diff --git a/opennds/Makefile b/opennds/Makefile index edda12e0f..172ee79e7 100644 --- a/opennds/Makefile +++ b/opennds/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opennds PKG_VERSION:=10.3.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/opennds/opennds/tar.gz/v$(PKG_VERSION)? @@ -30,7 +30,7 @@ define Package/opennds CATEGORY:=Network DEPENDS:=+libmicrohttpd-no-ssl TITLE:=open Network Demarcation Service - URL:=https://github.com/opennds/opennds + URL:=https://github.com/openNDS/openNDS CONFLICTS:=nodogsplash endef