Update openwrt which resolves weird workaround

This commit is contained in:
Fabian Bläse 2021-03-02 23:26:11 +01:00
parent 45b47b052a
commit ae3456a449
5 changed files with 11 additions and 65 deletions

View File

@ -14,9 +14,9 @@
builddir=./build
# OpenWrt: openwrt-19.07.5
OPENWRTREV="ec0c6c11436d233c3e1f3c1b4461a46348a1a0c7"
PACKAGEREV="9133e79ccb864bb2d92a386fc104258dc6c28de0"
ROUTINGREV="2e602f7b33c04a60ee7f8a3c08da8ebb76b5f53b"
OPENWRTREV="e3ab355dde"
PACKAGEREV="cf8cb8541ff8b979b24adff1ea9282ce2935846b"
ROUTINGREV="0f1d89c2e95a428835e269b0c0e832e8675c73e8"
# Gluon packages: master from 2020-02-04
GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"

View File

@ -1,44 +0,0 @@
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Wed, 22 Apr 2020 16:57:34 +0200
Subject: micrond: show stdout and stderr in log
So far, all output created by scripts run with micrond has been
discarded. Since there is no reason for that and it also does not
match the expected behavior, this enables both stdout and stderr
output for the service.
If not desired, a user can still use >/dev/null or similar in his/her
micrond jobs to disable output easily and similar to what it would be
on other systems.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
utils/micrond/Makefile | 2 +-
utils/micrond/files/etc/init.d/micrond | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/utils/micrond/Makefile b/utils/micrond/Makefile
index ba063b674..c979025bb 100644
--- a/utils/micrond/Makefile
+++ b/utils/micrond/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=micrond
PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_LICENSE:=BSD-2-clause
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/micrond/files/etc/init.d/micrond b/utils/micrond/files/etc/init.d/micrond
index 1eef2ef52..35a3b9e70 100755
--- a/utils/micrond/files/etc/init.d/micrond
+++ b/utils/micrond/files/etc/init.d/micrond
@@ -9,5 +9,7 @@ start_service() {
procd_open_instance
procd_set_param command /usr/sbin/micrond "$CRONDIR"
procd_set_param respawn
+ procd_set_param stdout 1
+ procd_set_param stderr 1
procd_close_instance
}

View File

@ -1,7 +1,7 @@
From f114914490740247f2b6ca705f0f7055db9681ab Mon Sep 17 00:00:00 2001
From af52d8a526d8aa99db937cd3ca86d49814bc4190 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Mon, 30 Sep 2019 17:09:10 +0200
Subject: [PATCH 1/2] babeld: Include PKG_RELEASE in babeld version
Subject: [PATCH] babeld: Include PKG_RELEASE in babeld version
This will account for custom patches added, as otherwise version
would stay the same.
@ -14,12 +14,12 @@ Signed-off-by: Fabian Bläse <fabian@blaese.de>
1 file changed, 5 insertions(+)
diff --git a/babeld/Makefile b/babeld/Makefile
index 022d0b8..78fdf83 100644
index 0b61128..b0ed749 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -48,6 +48,11 @@ MAKE_FLAGS+= \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -49,6 +49,11 @@ MAKE_FLAGS+= \
LDLIBS="" \
LDLIBS+="-lubus -lubox"
+define Build/Configure
+ echo "babeld-$(PKG_VERSION)+fff$(PKG_RELEASE)" > $(PKG_BUILD_DIR)/version
@ -30,5 +30,5 @@ index 022d0b8..78fdf83 100644
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
--
2.25.1
2.30.1

View File

@ -52,14 +52,3 @@ apply() {
revert() {
uci revert network
}
reload() {
# This is a dirty workaround because
# DSA refuses to correctly apply new
# vlan filtering on reload_config.
#
# This probably has to be fixed upstream.
# Until then, explicity restart the network
# service, which completely recreates the bridge.
/etc/init.d/network restart
}

View File

@ -12,7 +12,8 @@ define Package/fff-wireguard
URL:=https://www.freifunk-franken.de
DEPENDS:= \
+owipcalc \
+wireguard \
+kmod-wireguard \
+wireguard-tools \
+fff-babeld \
+fff-network
endef