From patchwork Sat Aug 22 11:07:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349649 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=hnOTikre; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4BYbKS0Ghcz9sSG for ; Sat, 22 Aug 2020 21:10:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uw2HPw6xe/2K9wjXqmedfByYbLq7gUvMuJk6eoUTPTg=; b=hnOTikreZzrXf40mf6PngLMY/ OtyFYpxFnur04rkLElulfqzQmckv1+4vmnX8T2zIbdpEQXVEYA0cR0RJNAG1C4sZuQ9gvlQYlXsuV 0+745BZfapj+SqUXSVAKfj0mtf2RH7yUYty8/2+UZXsv7MoLbfdefFEAnN8YOFeOrfWmXAsPYaZ8S pQn1P9Eo/dIdi1/2WhjukGvnxAW4qTpGbb0A91tybs6/0Zba6IZCXxOMKI63ns98mJ6Fr/1CKFyDR 4BcmNVbTuh3IhRHeCeBryFqYfjydgF0kHpvK662xZpOO6wZG9iEKkR+JUtRXszv+pqVuMTIL44AnC Vmta+3brQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROR-0003A9-Ce; Sat, 22 Aug 2020 11:09:03 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROI-00037A-IP for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:08:57 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MNL2Y-1jytnG0mlu-00OnG8; Sat, 22 Aug 2020 13:08:48 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 6/6] rb532: determine sysupgrade-* directory for upgrade automatically Date: Sat, 22 Aug 2020 13:07:52 +0200 Message-Id: <20200822110752.32600-7-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822110752.32600-1-freifunk@adrianschmutzler.de> References: <20200822110752.32600-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:oMSHMdm1X6zeibVtLZGoBz7yJzdY7A2SAD5hBMIkORwj7NI//DC nazD4xFESJEDJy7a2O2IccdMoSW8sN4mrNe8SgmOVGfyeHX1ehma333svIUsLB4zKArRbg0 8ChxA5hxIL5WBp1fhXHMBIovqUzvqfoudeJkN0EBu0z4UMMr9wzdqRtnr/N5TccROtJVD3i H0MUS9rltm5zdxbsnU8Xg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:ors9quU76X8=:NzmIl7Lpvw+kR/1YxhBnVZ RehUAckPXs00YX8+E1CLIh1D/ekNRfpY1RomCuPGzsQOdcaDD5T1rXNrOYIjaZp9L8vNlA4b6 Dk2Dq0Mr0kfoSY2Mmem2Q75Pa+JoASzLraUkNEweDi8Oh7NvFPOjZlY1GQHUa5ga71f+g9jV6 zLx58NCU9C/2lcYH+vNZjN9gPUUlL+dS/KUafY0/j2sI1iupcXBTrGzy5mkHYOy0WcbREbzVz hps8EjkpYgaLX27yBAv2lsdf60iceUeV7yAMLnckv5XczRlnqMt7xaeXeTKLKgHySZH6aNmvF Xoa6HM+JTV4Y1QeZijvIDDtYQ6ZMHA9AZzt5qRiEOcCQdUC4Ni+quVNrWGwJ6Xaqkw5OC0N7w lxrh3Kzu0mMpR77yvKOpuvAZjECU1WuQhuYxwAoIBcRWUc1OHveYJvOUq9N2LfkNF7ar6piL6 7vMEWpA557i2GO0vusGKrIxpC8Hm9LvSJc6if8khzp5Gocr1PrBO3J7GAKjH+42uG7Sh2hUnG e5vD96lXsjOGjmcpuNJUVt46VjIwGmPz4Rxsr0VBQN3FIiKY/8BKUcXTSEnR1c69AlD7BFl1N wZFMVXeDnirQdGm+RhW7xw8ts0xm3uLIOfQEnTPK7Z2jl0kvy3N7QAheByGTPJEkps1+SHYOs Vdt0793HO7Zzb/+nDd/ZXN6HA4cHGKvsu2ToQl5c36YZHjmFiTE1nI33M/hy/4skrZZr0yVD0 b0SqdSL/3Uk7pWC7gDFkfq6f/j00JJsoiyJM4xOSd/dnORQqFg5oJHR/HtYZhzeH1lT89R9M7 utWr0BM9sj+DEo5kl/eNt/PKIq+KqarCjNkVDN9lmiMbZANSjN4xQVJRqFJTysY5BAGEnEeqb c4+xzLpJKyoBvunkiyDw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_070854_820891_01324CE2 X-CRM114-Status: GOOD ( 11.25 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [212.227.126.133 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.133 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: roman@advem.lv Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org So far, the sysupgrade-* folder used during upgrade in rb532 was hardcoded to contain the board name. Therefore, changing board name or BOARD_NAME variable in image/Makefile might have broken upgrade. Improve this by adding a step to determine the folder name via a wildcard, as it is done for generic nand_upgrade_tar() in lib/upgrade/nand.sh and for several other targets already. Signed-off-by: Adrian Schmutzler --- target/linux/rb532/base-files/lib/upgrade/platform.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/linux/rb532/base-files/lib/upgrade/platform.sh b/target/linux/rb532/base-files/lib/upgrade/platform.sh index 334d6e2ff6..988bf2f0f3 100644 --- a/target/linux/rb532/base-files/lib/upgrade/platform.sh +++ b/target/linux/rb532/base-files/lib/upgrade/platform.sh @@ -11,7 +11,14 @@ platform_check_image() { } platform_do_upgrade() { + local tar_file="$1" + + local board_dir=$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$') + board_dir=${board_dir%/} + [ -n "$board_dir" ] || return 1 + mtd erase kernel - tar xf "$1" "sysupgrade-$(board_name)/kernel" -O | nandwrite -o /dev/mtd0 - - nand_do_upgrade "$1" + tar xf "$tar_file" "$(board_dir)/kernel" -O | nandwrite -o /dev/mtd0 - + + nand_do_upgrade "$tar_file" }