From patchwork Mon Sep 30 19:54:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1169555 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UNq4SEwn"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46htQw19JBz9sDB for ; Tue, 1 Oct 2019 05:54:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=aKOZ9P03VPFKES4v9GmFgZUqwnaMMrXW3Mp6kAiQNSI=; b=UNq4SEwnaSopSQ ernnxGUVsbgcqJYKqyQOppL3CPcARlFdDVo9PO7kT2MdCJG5zfMfiRDUXU4hQuKfTWNssfpg3+Pok xW2Xx5a8lKT2Xm/R1gf7NgL6/PdSCPpwzeDHHQakn+GGyKpBJbdXfG2FbJuvN1hvxTvStWG5EjeFV UpuYQwmYcXevQVIc7BteWwuEEdhEP+AFvOSVAKlyFZopqrOEre5wrcj7MVf/z1IKJK1rLqszwrwpe a/6NlkcJUBt7JHppk5CH/KNT68Gfa8t8AS8l5RQr4KY12kBdIULURUCuEQiZA5U4i5zwVjSDm9SQT Qbnd/Zsitkn6eQEndXkQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iF1kp-0008RI-Os; Mon, 30 Sep 2019 19:54:43 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iF1km-0008Qv-AB for openwrt-devel@lists.openwrt.org; Mon, 30 Sep 2019 19:54:42 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id AA4E53BA0; Mon, 30 Sep 2019 21:54:36 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id e36d27f5; Mon, 30 Sep 2019 21:54:27 +0200 (CEST) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Mon, 30 Sep 2019 21:54:25 +0200 Message-Id: <20190930195425.28617-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190930_125440_504720_4D224BA4 X-CRM114-Status: UNSURE ( 6.84 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 19.07] ar71xx: fix sysupgrade to ath79 for wndr3700v2 and wndr3800 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 --- 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|\