[OpenWrt-Devel] [PATCH 19.07] ar71xx: fix sysupgrade to ath79 for wndr3700v2 and wndr3800

Petr Štetiar ynezz at true.cz
Mon Sep 30 15:54:25 EDT 2019


ar71xx has just one board name wndr3700 for wndr 3700, 3700v2 and 3800
which is causing issues with sysupgrades to ath79 as there are separate
images for every board, so fix it by using proper board name on ar71xx
as well.

Ref: FS#2510
Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 target/linux/ar71xx/base-files/etc/board.d/01_leds            | 4 +++-
 target/linux/ar71xx/base-files/etc/diag.sh                    | 2 ++
 .../linux/ar71xx/base-files/etc/uci-defaults/04_led_migration | 2 ++
 target/linux/ar71xx/base-files/lib/ar71xx.sh                  | 3 +++
 target/linux/ar71xx/base-files/lib/upgrade/platform.sh        | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

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 8e49cb9fe253..26e685be1cb9 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -999,7 +999,9 @@ wam250)
 wndap360)
 	ucidef_set_led_power "power" "POWER GREEN" "netgear:green:power" "1"
 	;;
-wndr3700)
+wndr3700|\
+wndr3700v2|\
+wndr3800)
 	ucidef_set_led_default "wan" "WAN LED (green)" "netgear:green:wan" "0"
 	ucidef_set_led_usbport "usb" "USB" "netgear:green:usb" "usb1-port1"
 	;;
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 8ff75627a538..19adf8fa96a9 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -527,7 +527,9 @@ get_status_led() {
 	r6100|\
 	wndap360|\
 	wndr3700|\
+	wndr3700v2|\
 	wndr3700v4|\
+	wndr3800|\
 	wndr4300|\
 	wnr2000|\
 	wnr2000-v3|\
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
index 4dd224b549a3..3e2259b76e84 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
@@ -60,6 +60,8 @@ oolite-v1)
 	;;
 wndap360|\
 wndr3700|\
+wndr3700v2|\
+wndr3800|\
 wnr2000|\
 wnr2200)
 	migrate_leds "${board}:=netgear:"
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 894835b14d79..d85801956054 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -46,13 +46,16 @@ wndr3700_board_detect() {
 				machine="NETGEAR WNDRMAC"
 			else
 				machine="NETGEAR WNDR3700v2"
+				name="wndr3700v2"
 			fi
 			;;
 		'29763654+16+64'*)
 			machine="NETGEAR ${model_stripped:14}"
+			name="wndr3700v2"
 			;;
 		'29763654+16+128'*)
 			machine="NETGEAR ${model_stripped:15}"
+			name="wndr3800"
 			;;
 		*)
 			# Unknown ID
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 91bffcb8c1fd..86b9ab932f68 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -677,6 +677,8 @@ platform_check_image() {
 		return 1
 		;;
 	wndr3700|\
+	wndr3700v2|\
+	wndr3800|\
 	wnr1000-v2|\
 	wnr2000-v3|\
 	wnr612-v2|\

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list