[PATCH v5 1/2] OpenWrt: bump to 19.07.3
Adrian Schmutzler
freifunk at adrianschmutzler.de
So Mai 17 00:52:32 CEST 2020
Bump main repo, packages and routing repos.
Refresh patches, drop upstreamed ones.
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
...-OpenWrt-config-migration-mechanisms.patch | 6 +-
.../openwrt/0002-set-root-password.patch | 12 +--
.../openwrt/0003-ntpd-host-as-string.patch | 12 +--
...5-allow-building-all-devives-as-tiny.patch | 6 +-
...ed-LAN-WAN-MAC-address-for-Archer-C6.patch | 61 --------------
...ong-MAC-address-adjustment-for-Arche.patch | 28 -------
...h10k-increase-rx-buffer-size-to-2048.patch | 79 -------------------
buildscript | 6 +-
.../routing/0012-babeld-Update-to-1.9.2.patch | 41 ----------
9 files changed, 11 insertions(+), 240 deletions(-)
delete mode 100644 build_patches/openwrt/0021-ar71xx-fix-swapped-LAN-WAN-MAC-address-for-Archer-C6.patch
delete mode 100644 build_patches/openwrt/0022-ar71xx-remove-wrong-MAC-address-adjustment-for-Arche.patch
delete mode 100644 build_patches/openwrt/0030-mac80211-ath10k-increase-rx-buffer-size-to-2048.patch
delete mode 100644 feed_patches/routing/0012-babeld-Update-to-1.9.2.patch
diff --git a/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch b/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch
index fe36ea99..7c5b37cc 100644
--- a/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch
+++ b/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch
@@ -1,4 +1,3 @@
-From 5bc010240769c167dcbe13fa6aa726fb71a84f17 Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim at tn-x.org>
Date: Sat, 8 Jul 2017 10:46:59 +0200
Subject: Disable OpenWrt config migration mechanisms
@@ -7,7 +6,7 @@ This disables all OpenWrt config migration mechanisms except for
files listed in /etc/sysupgrade.conf
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index 6c518b780e..49d4514b98 100755
+index 6c518b780eddd973966537b50d8f7c82539bb1e1..49d4514b988e827098450d57da0ae50a37506d3a 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -134,9 +134,9 @@ list_changed_conffiles() {
@@ -22,6 +21,3 @@ index 6c518b780e..49d4514b98 100755
return 0
}
---
-2.25.1
-
diff --git a/build_patches/openwrt/0002-set-root-password.patch b/build_patches/openwrt/0002-set-root-password.patch
index 40362b2e..ce5e4a3f 100644
--- a/build_patches/openwrt/0002-set-root-password.patch
+++ b/build_patches/openwrt/0002-set-root-password.patch
@@ -1,14 +1,9 @@
-From d61fe229cf74badde02f617d66b2aab7d7ce96bc Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim at tn-x.org>
Date: Sat, 8 Jul 2017 10:47:28 +0200
-Subject: [PATCH 2/4] set root password
-
----
- package/base-files/files/etc/shadow | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Subject: set root password
diff --git a/package/base-files/files/etc/shadow b/package/base-files/files/etc/shadow
-index 4b4154f21f..b8d180a956 100644
+index 4b4154f21f478cc025a350363b3e34319c6afacc..b8d180a95691ab09f9c4d759ffd97da34a022623 100644
--- a/package/base-files/files/etc/shadow
+++ b/package/base-files/files/etc/shadow
@@ -1,4 +1,4 @@
@@ -17,6 +12,3 @@ index 4b4154f21f..b8d180a956 100644
daemon:*:0:0:99999:7:::
ftp:*:0:0:99999:7:::
network:*:0:0:99999:7:::
---
-2.25.1
-
diff --git a/build_patches/openwrt/0003-ntpd-host-as-string.patch b/build_patches/openwrt/0003-ntpd-host-as-string.patch
index 3a655063..4762277b 100644
--- a/build_patches/openwrt/0003-ntpd-host-as-string.patch
+++ b/build_patches/openwrt/0003-ntpd-host-as-string.patch
@@ -1,14 +1,9 @@
-From bc184e5c95dd934ad8c9d41fb5449390b4e160d2 Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim at tn-x.org>
Date: Sat, 8 Jul 2017 10:47:56 +0200
-Subject: [PATCH 3/4] ntpd host as string
-
----
- package/utils/busybox/files/sysntpd | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Subject: ntpd host as string
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
-index 52866ba32a..b6b28cd025 100755
+index 52866ba32acd26a490f9c9024fc3e43e0f757496..b6b28cd02527b89c0a4cc2f9adef52bb4c8427b0 100755
--- a/package/utils/busybox/files/sysntpd
+++ b/package/utils/busybox/files/sysntpd
@@ -30,7 +30,7 @@ get_dhcp_ntp_servers() {
@@ -20,6 +15,3 @@ index 52866ba32a..b6b28cd025 100755
}
start_ntpd_instance() {
---
-2.25.1
-
diff --git a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch
index e31487cd..5edd4748 100644
--- a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch
+++ b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch
@@ -1,9 +1,9 @@
From: Tim Niemeyer <tim at tn-x.org>
Date: Mon, 6 Aug 2018 18:39:04 +0200
-Subject: [PATCH 4/4] allow building all devives as tiny
+Subject: allow building all devives as tiny
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 804532b55c..6328d5cc29 100644
+index 804532b55cb145134acf47accd095bbb24dee059..6328d5cc2974bca549eab213d268591eec9e3cf5 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -23,6 +23,10 @@ include ./tiny.mk
@@ -18,7 +18,7 @@ index 804532b55c..6328d5cc29 100644
ifeq ($(SUBTARGET),nand)
include ./nand.mk
diff --git a/target/linux/ar71xx/tiny/config-default b/target/linux/ar71xx/tiny/config-default
-index 1148d8c451..eccc01757e 100644
+index 1148d8c451dee890c785ffb78ff0bb9de2454326..eccc01757e294a9a1d90c3e710ac619957528cb4 100644
--- a/target/linux/ar71xx/tiny/config-default
+++ b/target/linux/ar71xx/tiny/config-default
@@ -74,3 +74,19 @@ CONFIG_SOC_AR933X=y
diff --git a/build_patches/openwrt/0021-ar71xx-fix-swapped-LAN-WAN-MAC-address-for-Archer-C6.patch b/build_patches/openwrt/0021-ar71xx-fix-swapped-LAN-WAN-MAC-address-for-Archer-C6.patch
deleted file mode 100644
index dd013d3b..00000000
--- a/build_patches/openwrt/0021-ar71xx-fix-swapped-LAN-WAN-MAC-address-for-Archer-C6.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Adrian Schmutzler <freifunk at adrianschmutzler.de>
-Date: Wed, 11 Mar 2020 15:46:00 +0100
-Subject: ar71xx: fix swapped LAN/WAN MAC address for Archer C60 v1/v2
-
-The MAC addresses for lan/wan are swapped compared to the vendor
-firmware. This adjusts to vendor configuration, which is:
-
-lan *:7b label
-wan *:7c label+1
-2.4g *:7b label
-5g *:7a label-1
-
-Only one address is stored in <&mac 0x8>, corresponding to the label.
-
-This has been checked on revisions v1, v2 and v3.
-
-Since ar71xx calculates the ath10k MAC address based on the ethernet
-addresses, the number there is adjusted, too.
-
-Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
-(cherry picked from commit 14eb54938b525d4c2d2847a6fad7670ed944650c)
-
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 718fd7555c73c247cb662c0a8638895e2da38b84..8fb5be643c9c1372195bf10e3e45927c2f6a2a55 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -182,7 +182,7 @@ case "$FIRMWARE" in
- ath10kcal_extract "art" 20480 12064
- ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
- /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-- ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
-+ ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1)
- ;;
- cf-e385ac)
- ath10kcal_extract "art" 20480 12064
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
-index 88f4f081a34db9b289d393d9c7ad4693ddb9b01d..a0839e6bcadd39b826d657141c5ba94fc5b2a729 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
-@@ -157,8 +157,8 @@ static void __init archer_c60_v1_setup(void)
- ath79_register_mdio(0, 0x0);
- ath79_register_mdio(1, 0x0);
-
-- ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
-- ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
-+ ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
-+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
-
- /* WAN port */
- ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
-@@ -199,8 +199,8 @@ static void __init archer_c60_v2_setup(void)
- ath79_register_mdio(0, 0x0);
- ath79_register_mdio(1, 0x0);
-
-- ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
-- ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
-+ ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
-+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
-
- /* WAN port */
- ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
diff --git a/build_patches/openwrt/0022-ar71xx-remove-wrong-MAC-address-adjustment-for-Arche.patch b/build_patches/openwrt/0022-ar71xx-remove-wrong-MAC-address-adjustment-for-Arche.patch
deleted file mode 100644
index a9b10b10..00000000
--- a/build_patches/openwrt/0022-ar71xx-remove-wrong-MAC-address-adjustment-for-Arche.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Adrian Schmutzler <freifunk at adrianschmutzler.de>
-Date: Wed, 11 Mar 2020 15:52:41 +0100
-Subject: ar71xx: remove wrong MAC address adjustment for Archer C60 v2
-
-The adjustment of the MAC address for Archer C60 v2 in 10_fix_wifi_mac
-is broken since a "mac" partition is not set up for this device on
-ar71xx. Instead, the MAC address is already patched correctly in
-11-ath10k-caldata.
-
-Remove the useless adjustment.
-
-Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
-(cherry picked from commit cbdc91902466dd113b9680566abb2eb2f8022dd4)
-
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-index b58cf9b591f47c394c4c4b4a21e114e16af2da21..d6fac80bc942bc2ddc7d08c1ab0c5ead160701c6 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-@@ -15,8 +15,7 @@ case "$board" in
- archer-c58-v1|\
- archer-c59-v1|\
- archer-c59-v2|\
-- archer-c60-v1|\
-- archer-c60-v2)
-+ archer-c60-v1)
- echo $(macaddr_add $(mtd_get_mac_binary mac 8) $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
- ;;
- *)
diff --git a/build_patches/openwrt/0030-mac80211-ath10k-increase-rx-buffer-size-to-2048.patch b/build_patches/openwrt/0030-mac80211-ath10k-increase-rx-buffer-size-to-2048.patch
deleted file mode 100644
index 8bfe0893..00000000
--- a/build_patches/openwrt/0030-mac80211-ath10k-increase-rx-buffer-size-to-2048.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 40423025eb5d203affd1e0bb6677d5fabf7a522d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Linus=20L=C3=BCssing?= <ll at simonwunderlich.de>
-Date: Wed, 5 Feb 2020 20:10:43 +0100
-Subject: [PATCH] mac80211: ath10k: increase rx buffer size to 2048
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Before, only frames with a maximum size of 1528 bytes could be
-transmitted between two 802.11s nodes.
-
-For batman-adv for instance, which adds its own header to each frame,
-we typically need an MTU of at least 1532 bytes to be able to transmit
-without fragmentation.
-
-This patch now increases the maxmimum frame size from 1528 to 1656
-bytes.
-
-Tested with two ath10k devices in 802.11s mode, as well as with
-batman-adv on top of 802.11s with forwarding disabled.
-
-Fix originally found and developed by Ben Greear.
-
-Link: https://github.com/greearb/ath10k-ct/issues/89
-Link: https://github.com/greearb/ath10k-ct/commit/9e5ab25027e0971fa24ccf93373324c08c4e992d
-Cc: Ben Greear <greearb at candelatech.com>
-Signed-off-by: Linus Lüssing <ll at simonwunderlich.de>
-Signed-off-by: Sven Eckelmann <sven at narfation.org>
----
- ...h10k-increase-rx-buffer-size-to-2048.patch | 37 +++++++++++++++++++
- 1 file changed, 37 insertions(+)
- create mode 100644 package/kernel/mac80211/patches/ath/922-ath10k-increase-rx-buffer-size-to-2048.patch
-
-diff --git a/package/kernel/mac80211/patches/ath/922-ath10k-increase-rx-buffer-size-to-2048.patch b/package/kernel/mac80211/patches/ath/922-ath10k-increase-rx-buffer-size-to-2048.patch
-new file mode 100644
-index 0000000000..55429139fa
---- /dev/null
-+++ b/package/kernel/mac80211/patches/ath/922-ath10k-increase-rx-buffer-size-to-2048.patch
-@@ -0,0 +1,37 @@
-+From: Linus Lüssing <ll at simonwunderlich.de>
-+Date: Wed, 5 Feb 2020 20:10:43 +0100
-+Subject: ath10k: increase rx buffer size to 2048
-+
-+Before, only frames with a maximum size of 1528 bytes could be
-+transmitted between two 802.11s nodes.
-+
-+For batman-adv for instance, which adds its own header to each frame,
-+we typically need an MTU of at least 1532 bytes to be able to transmit
-+without fragmentation.
-+
-+This patch now increases the maxmimum frame size from 1528 to 1656
-+bytes.
-+
-+Tested with two ath10k devices in 802.11s mode, as well as with
-+batman-adv on top of 802.11s with forwarding disabled.
-+
-+Fix originally found and developed by Ben Greear.
-+
-+Link: https://github.com/greearb/ath10k-ct/issues/89
-+Link: https://github.com/greearb/ath10k-ct/commit/9e5ab25027e0971fa24ccf93373324c08c4e992d
-+Cc: Ben Greear <greearb at candelatech.com>
-+Signed-off-by: Linus Lüssing <ll at simonwunderlich.de>
-+
-+Forwarded: https://patchwork.kernel.org/patch/11367055/
-+
-+--- a/drivers/net/wireless/ath/ath10k/htt.h
-++++ b/drivers/net/wireless/ath/ath10k/htt.h
-+@@ -2219,7 +2219,7 @@ struct htt_rx_chan_info {
-+ * Should be: sizeof(struct htt_host_rx_desc) + max rx MSDU size,
-+ * rounded up to a cache line size.
-+ */
-+-#define HTT_RX_BUF_SIZE 1920
-++#define HTT_RX_BUF_SIZE 2048
-+ #define HTT_RX_MSDU_SIZE (HTT_RX_BUF_SIZE - (int)sizeof(struct htt_rx_desc))
-+
-+ /* Refill a bunch of RX buffers for each refill round so that FW/HW can handle
---
-2.26.2
-
diff --git a/buildscript b/buildscript
index d0eba008..27386d43 100755
--- a/buildscript
+++ b/buildscript
@@ -13,9 +13,9 @@
builddir=./build
-OPENWRTREV="v19.07.2"
+OPENWRTREV="v19.07.3"
OPENWRTURL="https://git.openwrt.org/openwrt/openwrt.git"
-PACKAGEREV="99efce0cd27adfcc53384fba93f37e5ee2e517de" # openwrt-19.07.2
+PACKAGEREV="2e6bd4cb86682b224803325127d3f777d40b3231" # openwrt-19.07.3
PACKAGEURL="https://git.openwrt.org/feed/packages.git"
## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches
@@ -36,7 +36,7 @@ GLUON_PKGS="simple-tc uradvd"
#official openwrt routing packages
ROUTING=(routing
https://git.openwrt.org/feed/routing.git
- efa6e5445adda9c6545f551808829ec927cbade8) # openwrt-19.07.2
+ 3f8571194c2765ed31aa73459e86c2ebf943d27d) # openwrt-19.07.3
ROUTING_PKGS="kmod-batman-adv batctl alfred babeld"
FFF=(fff)
diff --git a/feed_patches/routing/0012-babeld-Update-to-1.9.2.patch b/feed_patches/routing/0012-babeld-Update-to-1.9.2.patch
deleted file mode 100644
index 03a6dd2f..00000000
--- a/feed_patches/routing/0012-babeld-Update-to-1.9.2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 67268d29f5d7eeebd51608274beef412a8176715 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian at blaese.de>
-Date: Wed, 22 Apr 2020 12:52:41 +0200
-Subject: [PATCH] babeld: Update to version 1.9.2
-
-21 April 2020: babeld-1.9.2
-
- * Fixed two issues that could cause IPv4 routes to be represented
- incorrectly, with a range of confusing symptoms. Thanks to
- Fabian Bläse.
- * Fixed incorrect parsing of TLVs with an unknown Address Encoding.
- Thanks to Théophile Bastian.
- * Fixed access to mis-aligned data structure. Thanks to Antonin Décimo.
-
-Signed-off-by: Fabian Bläse <fabian at blaese.de>
----
- babeld/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/babeld/Makefile b/babeld/Makefile
-index 78fdf83..9ba3f0a 100644
---- a/babeld/Makefile
-+++ b/babeld/Makefile
-@@ -8,12 +8,12 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=babeld
--PKG_VERSION:=1.9.1
-+PKG_VERSION:=1.9.2
- PKG_RELEASE:=1
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
- PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/
--PKG_HASH:=1e1b3c01dd929177bc8d027aff1494da75e1e567e1f60df3bb45a78d5f1ca0b4
-+PKG_HASH:=154f00e0a8bf35d6ea9028886c3dc5c3c342dd1a367df55ef29a547b75867f07
-
- PKG_MAINTAINER:=Gabriel Kerneis <gabriel at kerneis.info>, \
- Baptiste Jonglez <openwrt-pkg at bitsofnetworks.org>
---
-2.26.2
-
--
2.20.1
Mehr Informationen über die Mailingliste franken-dev