From patchwork Wed Jan 30 14:51:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: OpenWrt: Bump openwrt, packages and routing to v18.06.2 From: Adrian Schmutzler X-Patchwork-Id: 1006 Message-Id: <20190130145107.2510-1-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Wed, 30 Jan 2019 15:51:07 +0100 Refresh patches. This introduces backported BATMAN fixes up to v2019.0. Signed-off-by: Adrian Schmutzler Reviewed-by: Robert Langhammer Reviewed-by: Tim Niemeyer Reviewed-by: Tim Niemeyer > --- No further adjustments seem to be required. Special implication of the tiny hack still need to be checked (I have not done that, although I expect no changes to that within a stable branch). --- .../openwrt/0001-sysupgrade-no-config-save.patch | 6 +++--- build_patches/openwrt/0002-set-root-password.patch | 6 +++--- .../openwrt/0003-ntpd-host-as-string.patch | 6 +++--- .../openwrt/0004-ar71xx-4.9-l2tp-stats.patch | 6 +++--- .../0005-allow-building-all-devives-as-tiny.patch | 8 ++++---- ...are-utils-tplink-safeloader-Add-CPE210-v3.patch | 6 +++--- ...-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch | 24 +++++++++++----------- buildscript | 8 ++++---- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch index 9cec4146..1ab8987b 100644 --- a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch +++ b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch @@ -1,4 +1,4 @@ -From 758b72379e994960ee1dcb0bf4f6db37140f59f0 Mon Sep 17 00:00:00 2001 +From e4ad344db97df356e178963cad6e517e2df92709 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 8 Jul 2017 10:46:59 +0200 Subject: [PATCH 1/4] sysupgrade no config save @@ -8,7 +8,7 @@ Subject: [PATCH 1/4] sysupgrade no config save 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade -index bf5428a..e7d6f90 100755 +index b75bd097f3..ddcfcd74e4 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -118,7 +118,7 @@ list_changed_conffiles() { @@ -21,5 +21,5 @@ index bf5428a..e7d6f90 100755 list_changed_conffiles ) | sort -u > "$file" return 0 -- -2.7.4 +2.11.0 diff --git a/build_patches/openwrt/0002-set-root-password.patch b/build_patches/openwrt/0002-set-root-password.patch index 3837e0d1..5defc8fc 100644 --- a/build_patches/openwrt/0002-set-root-password.patch +++ b/build_patches/openwrt/0002-set-root-password.patch @@ -1,4 +1,4 @@ -From b8eda046b9b2bbb5cf1feba5a0df67435aef240a Mon Sep 17 00:00:00 2001 +From 6782f72e0666bc1121df061ec2ca34c1035faf86 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 8 Jul 2017 10:47:28 +0200 Subject: [PATCH 2/4] set root password @@ -8,7 +8,7 @@ Subject: [PATCH 2/4] set root password 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/etc/shadow b/package/base-files/files/etc/shadow -index 4b4154f..b8d180a 100644 +index 4b4154f21f..b8d180a956 100644 --- a/package/base-files/files/etc/shadow +++ b/package/base-files/files/etc/shadow @@ -1,4 +1,4 @@ @@ -18,5 +18,5 @@ index 4b4154f..b8d180a 100644 ftp:*:0:0:99999:7::: network:*:0:0:99999:7::: -- -2.7.4 +2.11.0 diff --git a/build_patches/openwrt/0003-ntpd-host-as-string.patch b/build_patches/openwrt/0003-ntpd-host-as-string.patch index 0b7ffd95..0fb14c7b 100644 --- a/build_patches/openwrt/0003-ntpd-host-as-string.patch +++ b/build_patches/openwrt/0003-ntpd-host-as-string.patch @@ -1,4 +1,4 @@ -From 5957781393de24387301ffb1d49ee115bb713928 Mon Sep 17 00:00:00 2001 +From 380f33fde8bfb4e35eae7e5073ca2d0fd8270abf Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 8 Jul 2017 10:47:56 +0200 Subject: [PATCH 3/4] ntpd host as string @@ -8,7 +8,7 @@ Subject: [PATCH 3/4] ntpd host as string 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd -index e693e40..12383a4 100755 +index e693e4031c..12383a4937 100755 --- a/package/utils/busybox/files/sysntpd +++ b/package/utils/busybox/files/sysntpd @@ -30,7 +30,7 @@ get_dhcp_ntp_servers() { @@ -21,5 +21,5 @@ index e693e40..12383a4 100755 start_service() { -- -2.7.4 +2.11.0 diff --git a/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch b/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch index 283a812f..8aae6d02 100644 --- a/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch +++ b/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch @@ -1,4 +1,4 @@ -From 3280eb51202a8b6b4af55165b1b795fbd3c7318c Mon Sep 17 00:00:00 2001 +From 924934df6ca9696888f1b520560c8bc4df1d59eb Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 8 Jul 2017 10:48:53 +0200 Subject: [PATCH 4/4] ar71xx-4.9-l2tp-stats @@ -10,7 +10,7 @@ Subject: [PATCH 4/4] ar71xx-4.9-l2tp-stats diff --git a/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch b/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch new file mode 100644 -index 0000000..4348aea +index 0000000000..4348aea31c --- /dev/null +++ b/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch @@ -0,0 +1,38 @@ @@ -53,5 +53,5 @@ index 0000000..4348aea +2.7.2 + -- -2.7.4 +2.11.0 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 326dff6d..53e7a6f3 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,4 +1,4 @@ -From 7b0cf3e8670a1cb67f96d53b4aaf34f1a9774c6b Mon Sep 17 00:00:00 2001 +From e602e72f7e67db86264c7daf70c8cf2c32913139 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Mon, 6 Aug 2018 18:39:04 +0200 Subject: [PATCH] allow building all devives as tiny @@ -9,7 +9,7 @@ Subject: [PATCH] allow building all devives as tiny 2 files changed, 20 insertions(+) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 1eaf1e4..602323b 100644 +index 1eaf1e457c..602323bba2 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -22,6 +22,11 @@ endif @@ -25,7 +25,7 @@ index 1eaf1e4..602323b 100644 ifeq ($(SUBTARGET),nand) include ./nand.mk diff --git a/target/linux/ar71xx/tiny/config-default b/target/linux/ar71xx/tiny/config-default -index 2e9031a..4549c4a 100644 +index 2e9031a24c..4549c4a472 100644 --- a/target/linux/ar71xx/tiny/config-default +++ b/target/linux/ar71xx/tiny/config-default @@ -70,3 +70,18 @@ CONFIG_SOC_AR933X=y @@ -48,5 +48,5 @@ index 2e9031a..4549c4a 100644 +CONFIG_ATH79_MACH_UBNT_UNIFIAC=y +CONFIG_ATH79_MACH_UBNT_XM=y -- -2.7.4 +2.11.0 diff --git a/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch b/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch index d35b0f3e..941b7d73 100644 --- a/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch +++ b/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch @@ -1,4 +1,4 @@ -From 76c420d218b666e7b4415ca2186e3c2ce9d5d358 Mon Sep 17 00:00:00 2001 +From dc634e3bbd66089ea9d92f19983182bfdf2de13c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 10 Oct 2018 20:05:53 +0200 Subject: [PATCH 1/2] firmware-utils: tplink-safeloader: Add CPE210 v3 @@ -12,7 +12,7 @@ Signed-off-by: Robert Marko 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c -index b2cc96b..8164c1c 100644 +index 4b227e1c97..01885683c3 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -155,7 +155,7 @@ static struct device_info boards[] = { @@ -38,5 +38,5 @@ index b2cc96b..8164c1c 100644 .soft_ver = NULL, -- -2.7.4 +2.11.0 diff --git a/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch b/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch index 25123e4f..7d6af911 100644 --- a/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch +++ b/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch @@ -1,4 +1,4 @@ -From 8b4c513b3a3515bde608aa5d465ed6eac201eb24 Mon Sep 17 00:00:00 2001 +From 2eca1d93647356939a7388847a65cb2533cc5858 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 10 Oct 2018 20:13:09 +0200 Subject: [PATCH 2/2] ar71xx: Add support for TP-Link CPE210 v3 @@ -35,10 +35,10 @@ Signed-off-by: Robert Marko 7 files changed, 21 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds -index 858d675..25e2343 100755 +index 592133ac28..89cc0cbff7 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds -@@ -237,6 +237,7 @@ cf-e530n) +@@ -249,6 +249,7 @@ cf-e530n) ;; cpe210|\ cpe210-v2|\ @@ -46,7 +46,7 @@ index 858d675..25e2343 100755 cpe510|\ wbs210|\ wbs510) -@@ -247,7 +248,8 @@ wbs510) +@@ -259,7 +260,8 @@ wbs510) ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:green:link4" "wlan0" "76" "100" "-75" "13" case "$board" in @@ -57,7 +57,7 @@ index 858d675..25e2343 100755 ;; *) diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network -index b007636..f04ef27 100755 +index 6f5f07e1c5..0905a93785 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -75,6 +75,7 @@ ar71xx_setup_interfaces() @@ -69,10 +69,10 @@ index b007636..f04ef27 100755 eap120|\ eap300v2|\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 3af2eee..c943e5c 100755 +index ccbd4e77c3..2200069c64 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -577,6 +577,10 @@ ar71xx_board_detect() { +@@ -583,6 +583,10 @@ ar71xx_board_detect() { name="cpe210-v2" tplink_pharos_board_detect "$(tplink_pharos_v2_get_model_string)" ;; @@ -84,7 +84,7 @@ index 3af2eee..c943e5c 100755 name="cpe505n" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index ca1270b..a04dd74 100755 +index ca1270b7fd..a04dd7441d 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -587,7 +587,8 @@ platform_check_image() { @@ -98,7 +98,7 @@ index ca1270b..a04dd74 100755 return 1 ;; diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c -index ceb1769..f25a69f 100644 +index ceb1769ddd..f25a69f08e 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c @@ -236,6 +236,9 @@ MIPS_MACHINE(ATH79_MACH_CPE210, "CPE210", "TP-LINK CPE210/220", @@ -112,7 +112,7 @@ index ceb1769..f25a69f 100644 cpe510_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h -index 390ec0b..f7621c4 100644 +index 80f6e1d95b..c82cb17cf6 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -75,6 +75,7 @@ enum ath79_mach_type { @@ -124,7 +124,7 @@ index 390ec0b..f7621c4 100644 ATH79_MACH_CPE510, /* TP-LINK CPE510 */ ATH79_MACH_CPE830, /* YunCore CPE830 */ diff --git a/target/linux/ar71xx/image/generic-tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk -index 502c88b..e5aca30 100644 +index 338b2db2d6..571235a3b3 100644 --- a/target/linux/ar71xx/image/generic-tp-link.mk +++ b/target/linux/ar71xx/image/generic-tp-link.mk @@ -195,6 +195,13 @@ define Device/cpe210-v2 @@ -142,5 +142,5 @@ index 502c88b..e5aca30 100644 $(Device/cpe510-520-v1) DEVICE_TITLE := TP-LINK WBS210 v1 -- -2.7.4 +2.11.0 diff --git a/buildscript b/buildscript index b85ff2a3..3d5cefda 100755 --- a/buildscript +++ b/buildscript @@ -13,9 +13,9 @@ builddir=./build -OPENWRTREV="70255e3d624cd393612069aae0a859d1acbbeeae" # openwrt-18.06.1 +OPENWRTREV="a02809f61bf9fda0387d37bd05d0bcfe8397e25d" # openwrt-18.06.2 OPENWRTURL="https://git.openwrt.org/openwrt/openwrt.git" -PACKAGEREV="35e0b737ab496f5b51e80079b0d8c9b442e223f5" # openwrt-18.06.1 +PACKAGEREV="911bbd6bb4856f1e28ae00af37df62e4fa3529e5" # openwrt-18.06.2 PACKAGEURL="https://git.openwrt.org/feed/packages.git" ## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches @@ -38,8 +38,8 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd" #official openwrt routing packages ROUTING=(routing https://git.openwrt.org/feed/routing.git - 1b9d1c419f0ecefda51922a7845ab2183d6acd76 - "0002-Add-batman-adv-patch-to-remove-gw-mode-switch-messag.patch") # openwrt-18.06 from 2018-06-13 + ea345d16a6e27c2a8fdf67bf543cc36a5f189131 + "0002-Add-batman-adv-patch-to-remove-gw-mode-switch-messag.patch") # openwrt-18.06.2 ROUTING_PKGS="kmod-batman-adv batctl alfred babeld" FFF=(fff)