Automatically compute and substitute current values for all
$(AUTORELEASE) instances as this feature is deprecated and shouldn't be
used. Since commit 2584b0cecae ("CI: deprecate $(AUTORELEASE) via
comments"), this is even announced by the CI
The following temporary change was made to the core:
diff --git a/rules.mk b/rules.mk
index 57d7995d4fa8..f16367de87a8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -429,7 +429,7 @@ endef
abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1))))
COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
+AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile))
all:
FORCE: ;
And this command used to fix affected packages:
./scripts/feeds install -a routing
for i in $(cd feeds/routing; git grep -l 'PKG_RELEASE:=.*AUTORELEASE' | \
sed 's^.*/\([^/]*\)/Makefile^\1^';);
do
make package/${i%/Makefile}/download
done
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Naywatch now prints
naywatch: Naywatch Activated!
when becoming active.
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 09d5ceb923)
Naywatch should first try to reboot normally, and if that does not work
do a hard reboot. However, the hard reboot was never called.
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 65f747a8bc)
Check multiple rounds if neighbors are available before kicking. This
should reduce unneeded reboots.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Naywatch in combination with the watchdog can be tricky and dangerous
when doing a sysupgrade. Add a warning to always stop naywatch first and
check if procd took control over the watchdog again.
Also change use_watchdog to '0'.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Sometimes, naywatch can not handover the watchdog to procd again using
ubus. We need to call the same ubus command multiple times until procd
takes over control again.
Signed-off-by: Nick Hainke <vincent@systemli.org>
The network may crash on the SoCs, but the SoC itself does not. This
leads to a node no longer being accessible in a mesh network. If the
node is placed in a location that is not easily accessible, e.g. in a
high tower, it can cause a lot of problems. Therefore we check the
link-local connectivity on the configured interfaces.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Tested-by: Simon Polack <spolack+git@mailbox.org>
Signed-off-by: Simon Polack <spolack+git@mailbox.org>
