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

Signed-off-by: Wolfgang Hüttenhofer <wolfgang.huettenhofer@thw-erlangen.de>
Add support for TP-Link Archer C7 v4
2023-03-13 15:56:35 +01:00 · 2023-02-25 22:04:11 +01:00 · 2023-02-25 22:04:11 +01:00 · 2023-02-20 23:32:13 +01:00 · 2023-02-20 23:32:13 +01:00 · 2022-12-01 20:53:56 +01:00
25 changed files with 107 additions and 79 deletions
--- a/README.md
+++ b/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
--- a/bsp/ath79-generic.bsp
+++ b/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-*"
--- a/bsp/ath79-generic/.config
+++ b/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
--- a/bsp/ipq40xx-generic/.config
+++ b/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
--- a/bsp/ipq806x-generic/.config
+++ b/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
--- a/bsp/mpc85xx-p1010/.config
+++ b/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
--- a/bsp/octeon/.config
+++ b/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
--- a/bsp/ramips-mt7621/.config
+++ b/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
--- a/bsp/ramips-mt76x8/.config
+++ b/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
--- a/bsp/x86-64/.config
+++ b/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
--- a/build_patches/openwrt/0002-set-root-password.patch
+++ b/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:::
--- a/build_patches/openwrt/0010-ramips-add-missing-label-mac-device-mi-router-4a.patch
+++ b/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 {
--- a/build_patches/openwrt/0050-Disable-ipq40xx-lan-wan-separation.patch
+++ b/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,10 +38,10 @@ 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 87c79db5e1..666be0d145 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
-@@ -58,9 +58,8 @@ ipq40xx_setup_interfaces()
+@@ -68,9 +68,8 @@ ipq40xx_setup_interfaces()
 	avm,fritzbox-4040|\
 	linksys,ea6350v3|\
 	linksys,ea8300)
@ -52,6 +52,26 @@ index 87c79db5e1..666be0d145 100755
 		;;
 	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 545e3985ae..28453c2363 100644
--- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
-+++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
-@@ -1483,6 +1483,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;
-@@ -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;
-+	*/
- 
- 	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
+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.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
-+++ b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
+--- 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;
--- a/build_patches/openwrt/0100-Add-hack-which-fixes-forwarding-on-a-stacked-bridge-.patch
+++ b/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

--- a/6
+++ b/6
@ -7,9 +7,9 @@ set -o pipefail
 builddir=./build

 # OpenWrt: package hashes correspond to core repo version
-OPENWRTREV="v21.02.5"
-PACKAGEREV="0b16e3f359fe9d015861596d63c5bde4c56daa2e"
-ROUTINGREV="25e76489c83cfcee61e36a491896e1e9bfc3ec13"
+OPENWRTREV="v22.03.3"
+PACKAGEREV="2048c5bbf6c482e45b080eef4c1c531936f7f41b"
+ROUTINGREV="1a87333f268bcf0a11e3a665a357cb0d4ec2d680"

 # Gluon packages: master from 2020-02-04
 GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
--- a/src/packages/fff/fff-babel-bird2/Makefile
+++ b/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

--- a/src/packages/fff/fff-babel/Makefile
+++ b/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

--- a/src/packages/fff/fff-babel/files/lib/functions/fff/babel
+++ b/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

--- a/src/packages/fff/fff-base/Makefile
+++ b/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 \
--- a/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp
+++ b/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'
--- a/src/packages/fff/fff-firewall/Makefile
+++ b/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
--- a/src/packages/fff/fff-layer3/Makefile
+++ b/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 \
--- a/src/packages/fff/fff-macnock/Makefile
+++ b/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
--- a/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v4
+++ b/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)")
--- a/tools/dep-tree
+++ b/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
Author	SHA1	Message	Date
Wolfgang Hüttenhofer	2886654be8	README.md: Add description of ./buildscript clean command Signed-off-by: Wolfgang Hüttenhofer <wolfgang.huettenhofer@thw-erlangen.de>	2023-03-13 15:56:35 +01:00
Wolfgang Hüttenhofer	91ea1bdb99	Add support for TP-Link Archer C7 v4 Tested-by: Wolfgang Hüttenhofer <wolfgang.huettenhofer@thw-erlangen.de> Signed-off-by: Wolfgang Hüttenhofer <wolfgang.huettenhofer@thw-erlangen.de> Reviewed-by: Fabian Bläse <fabian@blaese.de>	2023-02-25 22:04:11 +01:00
Fabian Bläse	97942eb075	README.md: Rewrite contribution section for Pull-Request development Signed-off-by: Fabian Bläse <fabian@blaese.de>	2023-02-25 22:04:11 +01:00
Fabian Bläse	c12a9ba263	Use wpad-basic instead of wpad-basic-wolfssl The flash of some devices is too small to accomodate the additional wolfssl library, which is included by default on OpenWrt 22.03. In the future, the currently included mbedtls library should be replaced with wolfssl, so WPA3, OWE and 802.11s encryption can be used. Signed-off-by: Fabian Bläse <fabian@blaese.de>	2023-02-20 23:32:13 +01:00
Fabian Bläse	072452567f	OpenWrt: bump to v22.03 Bump core, packages and routing. Remove upstreamed build patches. Signed-off-by: Fabian Bläse <fabian@blaese.de>	2023-02-20 23:32:13 +01:00
Fabian Bläse	fcc8119906	bsp/x86-64: Include vmxnet3 driver Signed-off-by: Fabian Bläse <fabian@blaese.de>	2022-12-01 20:53:56 +01:00
Fabian Bläse	d9d2612f3c	build_patches: Add patch to fix wdr4900 wifi interface configuration A Linux patch which changed the kernel behavior of pci device naming was backported to Linux 5.4, and is therefore included in OpenWrt 21.02.5. However, the OpenWrt scripts generating the default uci configuration were not updated to accomodate this change. Therefore, wifi interface configuration does have various side effects on the wdr4900. Most of the time, more than two wifi radio/interface configurations are generated, which results in wifi not working properly (because our own configuration layer relies on the default configuration done by OpenWrt). Backport a patch from OpenWrt 22.03 / master, which works around this problem but has not been applied to the 21.02 branch. Based on: 7f4b4c29f3 (OpenWrt) Ref: https://github.com/openwrt/openwrt/issues/11002 Ref: https://github.com/openwrt/openwrt/pull/11005 Ref: https://github.com/openwrt/openwrt/issues/10530 Ref: https://github.com/openwrt/openwrt/pull/10554 Fixes: #267 Signed-off-by: Fabian Bläse <fabian@blaese.de>	2022-12-01 20:53:53 +01:00
Fabian Bläse	0e62ca5307	fff-dhcp: Do not generate dns records for local hostname By default OpenWRT generates A and AAAA records for the routers hostname. This might interferes with upstream records and breaks when DNSSEC is utilized. Therefore, disable this features. Signed-off-by: Fabian Bläse <fabian@blaese.de>	2022-11-26 16:47:24 +01:00
Fabian Bläse	d34438d8b1	build_patches: Add support for EON EN25QX128A Add support for a new SPI flash to the Linux kernel. It is required for recent versions of the Xiaomi Mi 4A Gigabit, which utilizes this SPI flash. Signed-off-by: Fabian Bläse <fabian@blaese.de> Tested-by: Fabian Bläse <fabian@blaese.de>	2022-11-26 16:47:14 +01:00
Robert Langhammer	306ed093f7	tools/dep-tree The tool dep-tree is broken since commit "Simplify firmware variant selection" Use the new package names for the roots of the tree to fix it. Signed-off-by: Robert Langhammer <rlanghammer@web.de> Reviewed-by: Fabian Bläse <fabian@blaese.de>	2022-11-26 16:43:40 +01:00
Fabian Bläse	2085c5e4af	fff-babel: Use bird2 implementation by default The bird2 babel implementation has proven to be the more reliable option over babeld, especially on low-end hardware. It has been working flawlessly on many test installations. Use bird2 instead of babeld, if no implementation is specified via uci. While at it, use the automatically incrementing $(COMMITCOUNT) for PKG_RELEASE. Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Christian Dresel <freifunk@dresel.systems>	2022-11-26 16:43:15 +01:00