OpenWrt: bump to v21.02.5

Bump core, packages and routing. Refresh patches. Signed-off-by: Fabian Bläse <fabian@blaese.de> Acked-by: Johannes Kimmel <fff@bareminimum.eu> [fff@bareminimum.eu: Tested on EdgeRouter X] Tested-by: Johannes Kimmel <fff@bareminimum.eu>
OpenWrt: bump to v21.02.3
2022-10-19 17:07:49 +02:00 · 2022-08-14 12:35:23 +02:00 · 2022-07-22 12:48:52 +02:00 · 2022-07-22 12:48:52 +02:00 · 2022-07-22 12:48:52 +02:00 · 2022-07-22 12:48:52 +02:00
11 changed files with 57 additions and 45 deletions
--- a/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch
+++ b/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch
@ -38,20 +38,20 @@ index ac11655904..147e159ea1 100755
 	;;
 avm,fritzbox-7530 |\
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 1d4c78833a..ea2cc60186 100755
+index 87c79db5e1..666be0d145 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -59,9 +59,8 @@ ipq40xx_setup_interfaces()
+@@ -58,9 +58,8 @@ ipq40xx_setup_interfaces()
+ 	avm,fritzbox-4040|\
 	linksys,ea6350v3|\
- 	linksys,ea8300|\
- 	linksys,mr8300)
+ 	linksys,ea8300)
 -		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		ucidef_add_switch "switch0" \
 -			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
 +			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
 		;;
- 	avm,fritzbox-7530)
- 		ucidef_add_switch "switch0" \
+ 	linksys,mr8300)
+ 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 diff --git a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
 index 015e5f5026..daa60639d1 100644
 --- a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
@ -80,10 +80,10 @@ index 015e5f5026..daa60639d1 100644
 /* Queues exposed to linux kernel */
 #define EDMA_NETDEV_TX_QUEUE 4
 diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
-index c35ba2799f..0517e4f29e 100644
+index 545e3985ae..28453c2363 100644
 --- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
 +++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
-@@ -1481,6 +1481,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
+@@ -1483,6 +1483,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
 	unsigned long bmp;
 
 	/* By default Enable VLAN */
@ -91,7 +91,7 @@ index c35ba2799f..0517e4f29e 100644
 	priv->vlan = 1;
 	priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp;
 	priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp;
-@@ -1492,6 +1493,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
+@@ -1494,6 +1495,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
 	bmp = priv->wan_bmp;
 	for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
 			priv->pvid[port] = AR40XX_WAN_VLAN;
@ -100,7 +100,7 @@ index c35ba2799f..0517e4f29e 100644
 	return 0;
 }
 diff --git a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
-index 7b2ddfe00d..1a01b08e41 100644
+index 3567eb7810..b13b312a91 100644
 --- a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
 +++ b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
@@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
--- a/24
+++ b/24
@ -7,9 +7,9 @@ set -o pipefail
 builddir=./build

 # OpenWrt: package hashes correspond to core repo version
-OPENWRTREV="v21.02.2"
-PACKAGEREV="b0ccc356900f6e1e1dc613d0ea980d5572f553dd"
-ROUTINGREV="10d3ffd8b30186b49538167bac1fa1bf9c88f860"
+OPENWRTREV="v21.02.5"
+PACKAGEREV="0b16e3f359fe9d015861596d63c5bde4c56daa2e"
+ROUTINGREV="25e76489c83cfcee61e36a491896e1e9bfc3ec13"

 # Gluon packages: master from 2020-02-04
 GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
@ -208,13 +208,19 @@ build() {

    case "$1" in
        "debug")
-            make V=99
+            if [ -n "$2" ]; then
+                make V=99 -j $2
+            else
+                make V=99
+            fi
            ;;
        "fast")
-            ionice -c 2 -- nice -n 1 -- make -j $((cpus*2))
+            [ -n "$2" ] && threads=$2 || threads=$((cpus*2))
+            ionice -c 2 -- nice -n 1 -- make -j $threads
            ;;
        *)
-            ionice -c 3 -- nice -n 10 -- make -j $((cpus+1))
+            [ -n "$2" ] && threads=$2 || threads=$((cpus+1))
+            ionice -c 3 -- nice -n 10 -- make -j $threads
            ;;
    esac

@ -444,13 +450,13 @@ case "$1" in
    "build")
        if [ "$2" = "help" ] || [ "$2" = "x" ]; then
            echo "This option compiles the firmware"
-            echo "Normaly the build uses lower IO and System priorities, "
+            echo "Normally the build uses lower IO and System priorities, "
            echo "you can append \"fast\" option, to use normal user priorities"
            echo
-            echo "Usage: $0 $1 [fast|debug]"
+            echo "Usage: $0 $1 [fast|debug] [numthreads]"
            echo
        else
-            build "$2"
+            build "$2" "$3"
        fi
        ;;
    "config")
--- a/src/packages/fff/fff-babel-bird2/files/etc/bird-fff.conf
+++ b/src/packages/fff/fff-babel-bird2/files/etc/bird-fff.conf
@ -45,7 +45,7 @@ protocol direct {
 			}

 			# only import GUA + ULA addresses
-			if net !~ 2000::/3 from ::/0  || net !~ fc00::/7 from ::/0 then {
+			if net !~ 2000::/3 from ::/0 && net !~ fc00::/7 from ::/0 then {
 				reject;
 			}

--- a/src/packages/fff/fff-layer3-config/files/usr/sbin/configure-layer3
+++ b/src/packages/fff/fff-layer3-config/files/usr/sbin/configure-layer3
@ -7,6 +7,7 @@
 execute_subshell() {
 	if [ $# -ne 1 ]; then
 		echo "Usage:" "$0" "<function>"
+		return 1
 	fi

 	for script in /etc/layer3.d/*; do
@ -23,7 +24,7 @@ execute_subshell() {
 		if [ $? -ne 0 ]; then
 			echo
 			echo "Error when executing" "$1" "from" "$(basename "$script")"
-			exit 1
+			return 1
 		fi
 	done
 }
@ -32,29 +33,33 @@ configure() {
 	echo "This script might remove existing vlans, interfaces, addresses, etc."
 	read -r -p "Do you really want to continue? (y/n) " response
 	if ! ( [ "$response" == "y" ] || [ "$response" == "Y" ] ); then
-		exit 1
+		return 1
 	fi

 	echo
-	execute_subshell configure
+	execute_subshell configure || return $?

-	exit 0
+	return 0
 }

 reload_services() {
 	execute_subshell reload
 	reload_config
+
+	return 0
 }

 apply_changes() {
 	execute_subshell apply
 	reload_services
-	exit 0
+
+	return 0
 }

 revert_changes() {
 	execute_subshell revert
-	exit 0
+
+	return 0
 }

 keep_changes() {
--- a/src/packages/fff/fff-web-ui/files/www/include/header
+++ b/src/packages/fff/fff-web-ui/files/www/include/header
@ -65,9 +65,12 @@ fi
 			if [ -s /tmp/isupdate ] ; then
 				VERSION=$(cat /tmp/isupdate)
 			%>
-				<table style="width: 100%;">
-					<tr>
-						<td><span style="font-size: 16pt; color:#FF0000">Es ist eine neue Firmware für deinen Freifunkrouter verfügbar.<br />Alte Version: <%= ${FIRMWARE_VERSION} %> - Neue Version: <%= ${VERSION} %> <br /><a href="upgrade.html">Firmware jetzt updaten</a></span></td>
-					</tr>
-				</table>
+				<div id="updatenotification" style="padding: 15px; margin: 4px; background-color: #cfcfcf; margin-bottom: 15px;">
+					<h3 style="font-size: 14pt; font-weight: bold; margin-bottom: 10px;">Es ist eine neue Firmware für deinen Freifunkrouter verfügbar!</h3>
+					<table style="margin-bottom: 10px;">
+					<tr><td>Installierte Version: </td><td><b><%= ${FIRMWARE_VERSION} %></b></td></tr>
+					<tr><td>Neue Version: </td><td><b><%= ${VERSION} %></b></td></tr>
+					</table>
+					<a href="https://dev.freifunk-franken.de" target="_blank">Zum Download</a> | <a href="upgrade.html">Zur Upgradeseite</a>
+				</div>
 			<% fi %>
--- a/src/packages/fff/fff-web-ui/files/www/public/cgi-bin/status.html
+++ b/src/packages/fff/fff-web-ui/files/www/public/cgi-bin/status.html
@ -61,8 +61,8 @@ contact="$(uci -q get "fff.system.contact")"
 							<legend>Status</legend>
 							<table>
 								<tr><th>Hood:</th><td><% echo "$hood" %></td></tr>
-								<tr><th>Bekannte Knoten:</th><td><% echo -n $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2> /dev/null)+1)) %></td></tr>
-								<tr><th>Nachbarknoten:</th><td><% echo -n $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2> /dev/null) %></td></tr>
+								<tr><th>Bekannte Knoten:</th><td><% echo -n $(($(batctl tg -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l)+1)) %></td></tr>
+								<tr><th>Nachbarknoten:</th><td><% echo -n $(batctl o -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l) %></td></tr>
 								<tr><th>Lokale Clients:</th><td><% echo -n $(batctl tl -H 2> /dev/null | grep -c 'W') %></td></tr>
 							</table>
 						</fieldset>
--- a/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/home.html
+++ b/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/home.html
@ -59,8 +59,8 @@ fi
 		<tr><th>Name:</th><td><%= ${HOSTNAME} %></td></tr>
 		<tr><th>Modell:</th><td><% cat /tmp/sysinfo/model 2>/dev/null %></td></tr>
 		<tr><th>MAC-Adresse:</th><td><%= $(cat /sys/class/net/br-client/address) %></td></tr>
-		<tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1)) %></td></tr>
-		<tr><th>Nachbarknoten:</th><td><%= $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null) %></td></tr>
+		<tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l)+1)) %></td></tr>
+		<tr><th>Nachbarknoten:</th><td><%= $(batctl o -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l) %></td></tr>
 		<tr><th>VPN via fastd:</th><td><%= ${vpn_active} %></td></tr>
 		<tr><th>fastd public key:</th><td><%= ${fastd_pub} %></td></tr>
 		<tr><th>Laufzeit:</th><td><%= ${uptime} %></td></tr>
--- a/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html
+++ b/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html
@ -9,8 +9,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
 		echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.config
 		sed -i '/^FORCEPARSE/d' /etc/network.config
 		echo "FORCEPARSE='2'" >> /etc/network.config
-		do_reboot=1
-		MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
+		do_reconfigure=1
+		MSG='<span class="green">Port Modus wird ge&auml;ndert!</span>'
 	fi
 	if [ "$POST_change_twoport" != "" ] ; then
 		sed -i '/^.*# set via WebUI/d' /etc/network.config
@ -18,8 +18,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
 		echo "LAN1MODE=\"${POST_mode1}\" # set via WebUI" >> /etc/network.config
 		sed -i '/^FORCEPARSE/d' /etc/network.config
 		echo "FORCEPARSE='2'" >> /etc/network.config
-		do_reboot=1
-		MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
+		do_reconfigure=1
+		MSG='<span class="green">Port Modus wird ge&auml;ndert!</span>'
 	fi
 fi

@ -182,13 +182,12 @@ format_port() {

 				Wenn diese Einstellung ver&auml;ndert wird, wird eine evtl. vorhandene manuelle Netzwerkkonfiguration in der
 				<tt>/etc/config/network</tt> &uuml;berschrieben.<br />
-				Anschlie&szlig;end wird der Router neugestartet.
 			</td></tr>
 		</table>
 	</fieldset>
 	</td></tr>
 <% fi %>
-<% if grep -q "LAN0PORT" "/etc/network.$board_name" || grep -q "LAN1PORT" "/etc/network.$board_name" ; then %>
+<% if grep -q "TWO_PORT" "/etc/network.$board_name" ; then %>
 	<%
 		# Device has two ports
 		. /etc/network.mode
@ -228,7 +227,6 @@ format_port() {

 				Wenn diese Einstellung ver&auml;ndert wird, wird eine evtl. vorhandene manuelle Netzwerkkonfiguration in der
 				<tt>/etc/config/network</tt> &uuml;berschrieben.<br />
-				Anschlie&szlig;end wird der Router neugestartet.
 			</td></tr>
 		</table>
 	</fieldset>
@ -239,7 +237,7 @@ format_port() {
 <%in /www/include/footer %>
 <%
 # write
-if [ "$do_reboot" = "1" ] ; then
-	reboot
+if [ "$do_reconfigure" = "1" ] ; then
+	configurenetwork
 fi
 %>
--- a/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/settings.html
+++ b/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/settings.html
@ -61,7 +61,7 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then

 		uci -q commit

-		MSG='<span class="green">Daten gespeichert! - Bitte Router neustarten.</span>'
+		MSG='<span class="green">Daten gespeichert!</span>'
 	fi
 fi
 %>
--- a/src/packages/fff/fff-web-ui/files/www/ssl/leaflet.css.gz
+++ b/src/packages/fff/fff-web-ui/files/www/ssl/leaflet.css.gz
--- a/src/packages/fff/fff-web-ui/files/www/ssl/leaflet.js.gz
+++ b/src/packages/fff/fff-web-ui/files/www/ssl/leaflet.js.gz
Author	SHA1	Message	Date
Fabian Bläse	e695b2a87a	OpenWrt: bump to v21.02.5 Bump core, packages and routing. Refresh patches. Signed-off-by: Fabian Bläse <fabian@blaese.de> Acked-by: Johannes Kimmel <fff@bareminimum.eu> [fff@bareminimum.eu: Tested on EdgeRouter X] Tested-by: Johannes Kimmel <fff@bareminimum.eu>	2022-10-19 17:07:49 +02:00
Fabian Bläse	0d06be1749	OpenWrt: bump to v21.02.3 Bump core, packages and routing. Signed-off-by: Fabian Bläse <fabian@blaese.de>	2022-08-14 12:35:23 +02:00
Fabian Bläse	bdfdbba76a	fff-layer3-config: return error values in functions instead of terminating Many functions of configure-layer3 terminate the program after successful execution, as they were originally only intended for execution of configure-layer3 commands. However, some functions are used both for command exection, but also as helper functions. For example, revert_changes() is used as a helper function in test_changes(). Terminating the program at the end of the function therefore ends the exection of test_changes() prematurely. As a result, the test mode of configure-layer3 never reloads services after a successful configuration revert. Replace exit commands with appropriate function return values, which can then be evaluated by the caller where appropriate. While at it, add a missing return to the parameter validation in execute_subshell(). Fixes: #256 Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Robert Langhammer <rlanghammer@web.de>	2022-07-22 12:48:52 +02:00
Fabian Bläse	baca28ece3	fff-web-ui: fix port selection for TWO_PORT devices Support for devices with two ports was originally intended for built-in swconfig switches with only two externally exposed ethernet ports. With the switch from ath71xx to ath79, the only device which ever made use of this uncommon configuration (CPE210-v1) now has to dedicated interfaces exposed to Linux. Therefore, two-port support was modified to support two distinct interfaces instead of swconfig switch configuration, which also simplified support for a few other devices. However, the Web UI has not been taken into account. Due to the way the Web UI detected a two-port device, the already implemented port selector is not shown. Use the TWO_PORT variable introduced with the change mentioned above to detect two-port devices instead. Fixes: #257 Fixes: `c22032e254` ("fff-network: support native two-port devices") Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Robert Langhammer <rlanghammer@web.de>	2022-07-22 12:48:52 +02:00
Johannes Kimmel	9bc3690cbd	fff-babel-bird2: fix filter for router ip imports Currently router ipv6 addresses imported via the direct protocol from the lo interface are all filtered. This should fix it. Signed-off-by: Johannes Kimmel <fff@bareminimum.eu> Reviewed-by: Fabian Bläse <fabian@blaese.de>	2022-07-22 12:48:52 +02:00
Robert Langhammer	e6efc9671a	fff-web-ui: fix redirection of stderr The stderr of batctl should be redirected. In a row of pipes a redirection at the end will only redirect the output of the last command! Put it on the right place. It's just shell grammar. Signed-off-by: Robert Langhammer <rlanghammer@web.de> Reviewed-by: Christian Dresel <freifunk@dresel.systems>	2022-07-22 12:48:52 +02:00
Fabian Bläse	a62f7cdf96	fff-web-ui: make update notification less ugly The update notification has been botched into the web ui a long time ago. It has not been overhauled ever since. Make it at least a little bit less ugly. Signed-off-by: Fabian Bläse <fabian@blaese.de>	2022-07-22 12:48:52 +02:00
Fabian Bläse	daf4467a8a	fff-web-ui: do not request unnecessary reboot None of our current settings require a reboot to be applied. Only a hood change is not done immediately. Therefore, the user is not required to reboot the router after changing settings, so remove the reboot request. Fixes: #107 Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Christian Dresel <freifunk@dresel.systems>	2022-07-22 12:48:48 +02:00
Fabian Bläse	b81c15d111	fff-web-ui: reconfigure port mode without reboot A full reboot is not required for changing the port mode. The port mode is configured dynamically using configurenetwork, which can be launched after the port mode has been changed. Fixes: #107 Signed-off-by: Fabian Bläse <fabian@blaese.de> Acked-by: Christian Dresel <freifunk@dresel.systems>	2022-07-22 12:48:33 +02:00
Fabian Bläse	f8182af459	fff-web-ui: update leaflet to 1.7.1 Signed-off-by: Fabian Bläse <fabian@blaese.de> Tested-by: Fabian Bläse <fabian@blaese.de>	2022-07-22 12:43:47 +02:00
Adrian Schmutzler	0dfa1140ff	buildscript: provide option to set number of threads during build This allows to specify the number of threads used in './buildscript build' manually by adding them as third option, e.g. ./buildscript build fast 20 ./buildscript build debug 4 ./buildscript build default 10 Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Reviewed-by: Fabian Bläse <fabian@blaese.de>	2022-07-22 12:43:19 +02:00