README.md: Add description of ./buildscript clean command

Signed-off-by: Wolfgang Hüttenhofer <wolfgang.huettenhofer@thw-erlangen.de>

README.md

@@ -56,6 +56,10 @@ Dieses Kommando arbeitet folgendermaßen:
 ### `./buildscript updatefeeds`
 Aktualisiert die OpenWrt Feeds für zusätzliche Pakete, die in die Firmware eingebaut werden. Dabei werden die Referenzen im build/ Verzeichnis aktualisiert. Dieser Schritt wird bereits von `./buildscript prepare` übernommen, daher ist dies nur bei manuellen Änderungen der Feeds nötig.
 
+### `./buildscript clean`
+Entfernt den Inhalt der bin/ und build/ Verzeichnisse und die Feeds in src/packages/. Damit werden beim nächsten `./buildscript prepare` alle Dateien die für das Bauen der Firmware nötig sind neu heruntergeladen. Dies kann nötig sein wenn z.B. seit dem letzen build ein größerer Versionssprung in OpenWRT gemacht wurde. Wenn es Fehler beim bauen gibt, wie fehlende Dependencies o.Ä., ist ein clean mal einen Versuch wert.
+* Nach einem clean muss daher erst noch einmal `./buildscript prepare` ausgeführt werden, bevor man mit `./buildscipt build` bauen kann!
+
 ### `./buildscript build`
 Sollte man am besten mit Hilfe des Tools 'screen' oder ähnlichem laufen lassen um einen Abbruch des Builds bei Verbindungsproblemen oder ähnlichem zu verhindern.
 * prebuild
@@ -132,9 +136,14 @@ scp root@[ipv6ll%scope]:/etc/network.tl-wr1043nd-v2 /path/to/git/firmware/bsp/wr
 ```
 
 ### BSP commiten und Patch erzeugen
-Nun kann man mit `git status` die Änderungen sehen. Mit `git add` staged man diese und mit `git commit` checkt man sie ein. `git format-patch origin/HEAD` erzeugt dann aus deinen Commits ein (oder mehr) Patches. Diese schickst du dann mit `git send-email --to franken-dev@freifunk.net *.patch` an unsere Liste. Dort nimmt sich jemand die Zeit und schaut kurz drüber und wenn alles passt finden deine Änderungen in den Hauptentwicklungszweig und sind ab dann Teil der Freifunk-Franken-Firmware.
+Nun kann man mit `git status` die Änderungen sehen.
+
+Damit man an mehreren Änderungen gleichzeitig arbeiten kann, sollte zunächst mit `git checkout -b mein-neues-feature` ein neuer Branch erzeugt werden. Dann können die Änderungen mit `git add` gestaged und danach mit `git commit` eingecheckt werden.
+
+Die so erzeugten Änderungen können dann mit einem Pull Request im [Gitea](https://git.freifunk-franken.de/freifunk-franken/firmware) submitted werden. Dafür ist ein [Account](https://docs.freifunk-franken.de/services/git.freifunk-franken/#anmeldung) nötig. Dazu muss das Firmware-Repository zunächst geforkt werden. Die SSH-Adresse des Forks (steht oben rechts) kann dann mit `git remote set-url origin gitea@git.freifunk-franken.de:meinname/firmware.git` in das lokale Repository eingetragen werden. Danach kann der weiter oben erstellte Branch mit `git push origin mein-neues-feature` in den Fork hochgeladen werden. Nun kann der Pull Request im Freifunk Franken Repository [angelegt](https://git.freifunk-franken.de/freifunk-franken/firmware/pulls) werden.
+
+Soll der Pull Request später geändert werden, dann müssen zunächst die nötigen Änderungen gemacht und danach mit `git commit --amend` in den bereits bestehenden Commit eingefügt werden. Dies kann dann mit `git push --force origin mein-neues-feature` in den Fork hochgeladen werden. Force ist hierbei nötig, da bereits bestehende Commits geändert werden. Der Pull Request wird dann automatisch aktualisiert. Um Reviews zu erleichtern sollten die Änderungen im Pull Request als Kommentar beschrieben werden.
 
-### Patch schicken
 Auf der Mailingliste franken-dev@freifunk.net kannst du natürlich jederzeit Fragen stellen, falls etwas nicht klar sein sollte.
 
 ## Hinzufügen von Paketen zum Image

bsp/ath79-generic.bsp

@@ -5,6 +5,7 @@ images=("openwrt-${chipset}-${subtarget}-glinet_gl-ar150-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_archer-c60-v1-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_archer-c60-v2-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_archer-c7-v2-squashfs-*"
+        "openwrt-${chipset}-${subtarget}-tplink_archer-c7-v4-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_archer-c7-v5-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_cpe210-v1-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_cpe210-v2-squashfs-*"

bsp/ath79-generic/.config

@@ -14,6 +14,8 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c60-v2=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c60-v2="-kmod-ath10k-ct-smallbuffers kmod-ath10k-smallbuffers -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888"
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v2=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v2="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
+CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v4=y
+CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v4="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v5=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v5="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v1=y
@@ -83,7 +85,10 @@ CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
 CONFIG_PACKAGE_hostapd-mini=y
 CONFIG_PACKAGE_iwinfo=m
 CONFIG_PACKAGE_libiwinfo=m
+CONFIG_PACKAGE_libwolfssl=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic=y
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_PACKAGE_wpad-mini=m
 CONFIG_PACKAGE_ath10k-firmware-qca9887=m
 CONFIG_PACKAGE_ath10k-firmware-qca9888=m

bsp/ipq40xx-generic/.config

@@ -20,6 +20,9 @@ CONFIG_PACKAGE_ath10k-firmware-qca4019=m
 CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=m
 CONFIG_PACKAGE_kmod-ath10k=m
 CONFIG_PACKAGE_kmod-ath10k-ct=m
+CONFIG_PACKAGE_libwolfssl=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic=y
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y
 CONFIG_PACKAGE_kmod-hwmon-core=y

bsp/ipq806x-generic/.config

@@ -23,7 +23,10 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
+CONFIG_PACKAGE_libwolfssl=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic=y
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_PACKAGE_ath10k-firmware-qca99x0=m
 CONFIG_PACKAGE_kmod-ath10k=y
 CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct=m

bsp/mpc85xx-p1010/.config

@@ -23,6 +23,9 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
+CONFIG_PACKAGE_libwolfssl=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic=y
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y
 CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512

bsp/octeon/.config

@@ -16,6 +16,9 @@ CONFIG_TARGET_PER_DEVICE_ROOTFS=y
 CONFIG_CLEAN_IPKG=y
 # CONFIG_DROPBEAR_CURVE25519 is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
+CONFIG_PACKAGE_libwolfssl=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic=y
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y
 CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512

bsp/ramips-mt7621/.config

@@ -29,6 +29,9 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
+CONFIG_PACKAGE_libwolfssl=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic=y
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y
 CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512

bsp/ramips-mt76x8/.config

@@ -29,5 +29,8 @@ CONFIG_CLEAN_IPKG=y
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
 # CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
 # CONFIG_PACKAGE_ALFRED_VIS is not set
+CONFIG_PACKAGE_libwolfssl=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic=y
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y

bsp/x86-64/.config

@@ -14,5 +14,9 @@ CONFIG_TARGET_PER_DEVICE_ROOTFS=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_CLEAN_IPKG=y
 # CONFIG_PACKAGE_ALFRED_VIS is not set
+CONFIG_PACKAGE_kmod-vmxnet3=y
+CONFIG_PACKAGE_libwolfssl=m
 CONFIG_PACKAGE_opkg=m
+CONFIG_PACKAGE_wpad-basic=y
+CONFIG_PACKAGE_wpad-basic-wolfssl=m
 CONFIG_STRIP_KERNEL_EXPORTS=y

build_patches/openwrt/0002-set-root-password.patch

@@ -7,7 +7,7 @@ index 4b4154f21f478cc025a350363b3e34319c6afacc..b8d180a95691ab09f9c4d759ffd97da3
 --- a/package/base-files/files/etc/shadow
 +++ b/package/base-files/files/etc/shadow
 @@ -1,4 +1,4 @@
--root::0:0:99999:7:::
+-root:::0:99999:7:::
 +root:$1$OmvoKpjK$e.lPVnBxsrAbNV4EoH3xb1:0:0:99999:7:::
  daemon:*:0:0:99999:7:::
  ftp:*:0:0:99999:7:::

build_patches/openwrt/0010-ramips-add-missing-label-mac-device-mi-router-4a.patch

@@ -1,25 +0,0 @@
-From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
-Date: Mon, 19 Jul 2021 21:54:29 +0200
-Subject: [PATCH] ramips: add missing label-mac-device for Xiaomi Mi Router 4A
- (100M)
-
-As both the Mi Router 4A (100M) and the Mi Router 4C use the same
-label-mac-device, the alias can be moved to the shared dtsi.
-
-Signed-off-by: Fabian Bläse <fabian@blaese.de>
----
- target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
-index 0f5897f5c593..d3f5e33be732 100644
---- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
-+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
-@@ -11,6 +11,7 @@
- 		led-failsafe = &led_power_yellow;
- 		led-running = &led_power_blue;
- 		led-upgrade = &led_power_yellow;
-+		label-mac-device = &ethernet;
- 	};
- 
- 	chosen {

build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch

@@ -19,16 +19,16 @@ These changes are currently only done with the FritzBox 4040 in mind.
 ---
  .../linux/ipq40xx/base-files/etc/board.d/01_leds |  2 +-
  .../ipq40xx/base-files/etc/board.d/02_network    |  3 +--
+ .../ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c |  2 ++
  .../drivers/net/ethernet/qualcomm/essedma/edma.h | 16 ++++++++--------
- .../linux/ipq40xx/files/drivers/net/phy/ar40xx.c |  2 ++
  ...1-dts-ipq4019-add-ethernet-essedma-node.patch |  6 +++---
  5 files changed, 15 insertions(+), 14 deletions(-)
 
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-index ac11655904..147e159ea1 100755
+index 884b265dcb..77b0754635 100644
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-@@ -19,7 +19,7 @@ asus,rt-ac58u)
+@@ -24,7 +24,7 @@ asus,rt-ac58u)
  	;;
  avm,fritzbox-4040)
  	ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" "phy1tpt"
@@ -38,20 +38,40 @@ 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 2aa4886e6a..7390769661 100644
 --- 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()
+@@ -68,9 +68,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-5.10/drivers/net/mdio/ar40xx.c b/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c
+index f7ce42b9ff..a8da7ac653 100644
+--- a/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c
++++ b/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c
+@@ -1481,6 +1481,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
+ 	unsigned long bmp;
+ 
+ 	/* By default Enable VLAN */
++	/*
+ 	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)
+ 	bmp = priv->wan_bmp;
+ 	for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
+ 			priv->pvid[port] = AR40XX_WAN_VLAN;
++	*/
+ 
+ 	return 0;
+ }
 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
@@ -79,30 +99,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
---- 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)
- 	unsigned long bmp;
- 
- 	/* By default Enable VLAN */
-+	/*
- 	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)
- 	bmp = priv->wan_bmp;
- 	for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
- 			priv->pvid[port] = AR40XX_WAN_VLAN;
-+	*/
- 
- 	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
---- 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
+diff --git a/target/linux/ipq40xx/patches-5.10/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.10/711-dts-ipq4019-add-ethernet-essedma-node.patch
+index 3567eb7810..b13b312a91 100644
+--- a/target/linux/ipq40xx/patches-5.10/711-dts-ipq4019-add-ethernet-essedma-node.patch
++++ b/target/linux/ipq40xx/patches-5.10/711-dts-ipq4019-add-ethernet-essedma-node.patch
 @@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  +			qcom,rx_head_buf_size = <1540>;
  +			qcom,mdio_supported;

build_patches/openwrt/0100-Add-hack-which-fixes-forwarding-on-a-stacked-bridge-.patch

@@ -1,19 +1,18 @@
-From f53b71d2907eeb0d80e79d99fa7b756b5e5bf32b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
 Date: Thu, 24 Feb 2022 00:04:47 +0100
 Subject: [PATCH] Add hack which fixes forwarding on a stacked bridge
  configuration using DSA
 
 ---
- .../hack-5.4/999-fix-stacked-bridge-forwarding.patch | 12 ++++++++++++
+ .../999-fix-stacked-bridge-forwarding.patch          | 12 ++++++++++++
  1 file changed, 12 insertions(+)
- create mode 100644 target/linux/generic/hack-5.4/999-fix-stacked-bridge-forwarding.patch
+ create mode 100644 target/linux/generic/hack-5.10/999-fix-stacked-bridge-forwarding.patch
 
-diff --git a/target/linux/generic/hack-5.4/999-fix-stacked-bridge-forwarding.patch b/target/linux/generic/hack-5.4/999-fix-stacked-bridge-forwarding.patch
+diff --git a/target/linux/generic/hack-5.10/999-fix-stacked-bridge-forwarding.patch b/target/linux/generic/hack-5.10/999-fix-stacked-bridge-forwarding.patch
 new file mode 100644
 index 0000000000..e1d4cb9cd5
 --- /dev/null
-+++ b/target/linux/generic/hack-5.4/999-fix-stacked-bridge-forwarding.patch
++++ b/target/linux/generic/hack-5.10/999-fix-stacked-bridge-forwarding.patch
 @@ -0,0 +1,12 @@
 +--- a/net/bridge/br_input.c
 ++++ b/net/bridge/br_input.c
@@ -27,6 +26,4 @@ index 0000000000..e1d4cb9cd5
 + 	indev = skb->dev;
 + 	skb->dev = brdev;
 + 	skb = br_handle_vlan(br, NULL, vg, skb);
--- 
-2.35.1
 

buildscript

@@ -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="v22.03.3"
+PACKAGEREV="2048c5bbf6c482e45b080eef4c1c531936f7f41b"
+ROUTINGREV="1a87333f268bcf0a11e3a665a357cb0d4ec2d680"
 
 # 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")

src/packages/fff/fff-babel-bird2/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-babel-bird2
-PKG_RELEASE:=1
+PKG_RELEASE:=$(COMMITCOUNT)
 
 include $(INCLUDE_DIR)/package.mk
 

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;
 			}
 

src/packages/fff/fff-babel/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-babel
-PKG_RELEASE:=1
+PKG_RELEASE:=$(COMMITCOUNT)
 
 include $(INCLUDE_DIR)/package.mk
 

src/packages/fff/fff-babel/files/lib/functions/fff/babel

@@ -1,6 +1,6 @@
 
 implementation=$(uci -q get babelimpl.impl.impl)
-[ -z "$implementation" ] && implementation=babeld
+[ -z "$implementation" ] && implementation=bird2
 
 . /lib/functions/fff/babeldaemon/$implementation
 

src/packages/fff/fff-base/Makefile

@@ -12,8 +12,8 @@ define Package/fff-base
 	URL:=https://www.freifunk-franken.de
 	DEFAULT:=y
 	DEPENDS:= \
-		+iptables \
-		+ip6tables \
+		+iptables-legacy \
+		+ip6tables-legacy \
 		+micrond \
 		+odhcp6c \
 		+fff-config \

src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp

@@ -26,6 +26,12 @@ uci batch >/dev/null <<EOF
   set dhcp.@dnsmasq[-1].noresolv='1'
   set dhcp.@dnsmasq[-1].localservice='1'
 
+  # do not generate A or AAAA records for the routers hostname,
+  # because this might interfere with upstream records.
+  #
+  # e.g. hostname: 'router.fff.community'
+  set dhcp.@dnsmasq[-1].add_local_fqdn='0'
+
   set dhcp.client=dhcp
   set dhcp.client.interface='client'
   set dhcp.client.leasetime='1h'

src/packages/fff/fff-firewall/Makefile

@@ -10,8 +10,8 @@ define Package/$(PKG_NAME)
 	CATEGORY:=Freifunk
 	TITLE:=Freifunk-Franken firewall
 	URL:=https://www.freifunk-franken.de
-	DEPENDS:=+arptables \
-			 +ebtables +ebtables-utils \
+	DEPENDS:=+arptables-legacy \
+			 +ebtables-legacy +ebtables-legacy-utils \
 			 +kmod-ebtables-ipv4 +kmod-ebtables-ipv6 \
 			 +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra \
 			 +kmod-nf-conntrack6

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() {

src/packages/fff/fff-layer3/Makefile

@@ -23,10 +23,10 @@ define Package/fff-layer3
 	         +fff-ra \
 	         +fff-web-mqtt \
 	         +fff-wireguard \
-	         +arptables \
+	         +arptables-legacy \
 	         +bmon \
-	         +ebtables \
-	         +ebtables-utils \
+	         +ebtables-legacy \
+	         +ebtables-legacy-utils \
 	         +kmod-ebtables-ipv4 \
 	         +kmod-ebtables-ipv6 \
 	         +kmod-sched-cake \
@@ -39,6 +39,7 @@ define Package/fff-layer3
 	         +iptables-mod-ipopt \
 	         +iptables-mod-conntrack-extra \
 	         +mtr \
+	         +nftables \
 	         +snmp-utils \
 	         +tc \
 	         +tcpdump \

src/packages/fff/fff-macnock/Makefile

@@ -11,7 +11,7 @@ PKG_SOURCE_VERSION:=d0bdfdba569934442e9d8bfc01bcc6c3712b6011
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-CMAKE_OPTIONS:=-DMACNOCK_DEBUG=ON
+CMAKE_OPTIONS+=-DMACNOCK_DEBUG=ON
 
 define Package/$(PKG_NAME)
 	SECTION:=base

src/packages/fff/fff-network/mips/network.tplink,archer-c7-v4

@@ -0,0 +1,12 @@
+. /lib/functions/fff/network
+
+WANDEV=eth0
+SWITCHDEV=eth0
+CLIENT_PORTS="4 5 0t"
+WAN_PORTS="1 0t"
+BATMAN_PORTS="2 3 0t"
+
+# use mac address from phy1 with 'locally administered' bit set to '1'
+# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
+
+ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")

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 %>

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>

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>

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
 %>

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
 %>

tools/dep-tree

@@ -31,8 +31,8 @@ write_deps() {
 	done
 }
 
-for v in $variant; do
-	defaults="$defaults fff-variant-$v"
+for v in base $variant; do
+	defaults="$defaults fff-$v"
 done
 # start tree
 for package in $defaults; do