From patchwork Wed Nov 29 18:02:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 842685 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pcPhbogW"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b="nZB8OQfK"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yn7hF6FK4z9s4s for ; Thu, 30 Nov 2017 05:03:57 +1100 (AEDT) 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=rvotNi0giqeMolNc87YT6613VIOBnIjjYp0kOPj23s4=; b=pcPhbogWiC4uJK rwYNgFqhNVA4rl11czIG/ZkP1LL5CvIBemTbm/p0mK0F9Q0xDc1PK4IGaU5YjV66PsbDg2ZM4TX/3 zvNsX+2MoIOWb+12Utd31pLHX36hZASQzrmPoLPqzuC2qRxZt6Gsu/gIx2S7RxcFFUeqxDLvtGAKn F983t980aw7ISN3gaks8BNlpFSRjbrY9XtMZVWh+Y3SQdDB+xb/ueluiFw+4t/jCN9epRxtsJOPjk 6+rflIavOV/NSz2ipnZEkTFcQ0dGQCOva18BZV5YVdnRfghuC1NHWKuOFXbKZQHbMLOrwiCwRdlDo CzWyGBkbwHB00uVzmFAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eK6i1-00031B-BG; Wed, 29 Nov 2017 18:03:45 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eK6hc-00030B-3H for lede-dev@lists.infradead.org; Wed, 29 Nov 2017 18:03:22 +0000 Received: by mail-wm0-x244.google.com with SMTP id g75so8205410wme.0 for ; Wed, 29 Nov 2017 10:02:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=BPZ6WfiYtK8hxR2KZXPQTH2ToFSnqRR2PTKaLQEGpXg=; b=nZB8OQfK/aCLJZXiyqpkDQj94BiTDdjgXGHeFgE2pn4G1ZviFXIO9yWkR5GupFnMef ykKdsXS2HgyTBLhUhgozXUilzqQle0+GLmRV0eKPkiDYvFuRNM7Rdep9IBfQzWsA/z1M XV1+HKcDqEAKNLzZiNRjCAjYqg2eJt/vyaguobo3jEqKdwfcPrnYJjEtxJVf6Nz3sy1l GshpJAW83KpbeQ8K0vc5Ncro9iFA7ppUSfWVh7n3pINL9CqyCoqQXdBOvhZHUr3wEPsu 80m4+Ff7FTaXpDGMGPQzSM6bVXX1xWILk6Tt1i04BjvWWLaIPVyrPsrUuUIyCTL7/WiH l0Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=BPZ6WfiYtK8hxR2KZXPQTH2ToFSnqRR2PTKaLQEGpXg=; b=nIqvWErDB3HDQ7vZjRIwL5mufLjxxzhXppBntiZz5g1sjqfJLaDm8x9pT1Uk3kpr3G 5vcSuPXMvffWrGS0355GaxGBNNHLEyBoRMdcbcHRCLOSwclcD86GCdAnYSv2r77ekEMJ bRzVAbGK90LEuhfroN4m8D98Rx3da/UfKTtH66Bm+bTXRzBcmiKrQs7vP8WtHR8Z9k8k MJAwLKtCjhHxM3CTd70HmS65xiGMN1iiVoBFI8D9PFhl02EWJIhJBe6eVZwX/iRqalIF kbZvSKaiFPq3ZCEdTNKcjacuJmQEqtSnHMw6lXni59TeT2WC+ttUhtidOlnEYwVzKD2B 1puQ== X-Gm-Message-State: AJaThX77rlg7tfyiifPGh1qJtyhcBnAU+wwoTdBidjrH/cuhfju0lag2 Hzu5K0+MJOnHwteg23s4qhtELQjd X-Google-Smtp-Source: AGs4zMb6sRFBobsaki9skUasm5NXl2ChRNbzfNE3r3PUDrLH3JxVNo0hHFh2GMc/eZ1XAXO/NFGYLw== X-Received: by 10.28.105.76 with SMTP id e73mr3400876wmc.116.1511978576612; Wed, 29 Nov 2017 10:02:56 -0800 (PST) Received: from desktop.wvd.kresin.me (p2003008C2F216410510D3EC087D29DC6.dip0.t-ipconnect.de. [2003:8c:2f21:6410:510d:3ec0:87d2:9dc6]) by smtp.gmail.com with ESMTPSA id e131sm35252442wmg.1.2017.11.29.10.02.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Nov 2017 10:02:56 -0800 (PST) From: Mathias Kresin To: lede-dev@lists.infradead.org Date: Wed, 29 Nov 2017 19:02:26 +0100 Message-Id: <1511978546-19719-1-git-send-email-dev@kresin.me> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171129_100320_387668_8F08EB4C X-CRM114-Status: UNSURE ( 7.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:244 listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH] procd: nand: dont rely on boardname in nand_upgrade_tar X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Kernel and rootfs in a subdirectory matching the userspace boardname was intended to use a single sysupgrade-tar archive for multiple boards with different kernel/rootfs images. This feature was never used. Use the first found directory in the tar archive instead of relying on a directory named according to the userspace boardname. It allows to change the boardname without adding another compatibility layer - using the nand_board_name() function - for (sub)targets using the metadata based image validation in favour to nand_do_platform_check(). Signed-off-by: Mathias Kresin --- package/base-files/files/lib/upgrade/nand.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh index 563db4c..1c6b86b 100644 --- a/package/base-files/files/lib/upgrade/nand.sh +++ b/package/base-files/files/lib/upgrade/nand.sh @@ -250,19 +250,21 @@ nand_board_name() { nand_upgrade_tar() { local tar_file="$1" - local board_name="$(nand_board_name)" local kernel_mtd="$(find_mtd_index $CI_KERNPART)" - local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null` - local rootfs_length=`(tar xf $tar_file sysupgrade-$board_name/root -O | wc -c) 2> /dev/null` + local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$') + board_dir=${board_dir%/} - local rootfs_type="$(identify_tar "$tar_file" sysupgrade-$board_name/root)" + local kernel_length=`(tar xf $tar_file ${board_dir}/kernel -O | wc -c) 2> /dev/null` + local rootfs_length=`(tar xf $tar_file ${board_dir}/root -O | wc -c) 2> /dev/null` + + local rootfs_type="$(identify_tar "$tar_file" ${board_dir}/root)" local has_kernel=1 local has_env=0 [ "$kernel_length" != 0 -a -n "$kernel_mtd" ] && { - tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - $CI_KERNPART + tar xf $tar_file ${board_dir}/kernel -O | mtd write - $CI_KERNPART } [ "$kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0 @@ -271,12 +273,12 @@ nand_upgrade_tar() { local ubidev="$( nand_find_ubi "$CI_UBIPART" )" [ "$has_kernel" = "1" ] && { local kern_ubivol="$(nand_find_volume $ubidev $CI_KERNPART)" - tar xf $tar_file sysupgrade-$board_name/kernel -O | \ + tar xf $tar_file ${board_dir}/kernel -O | \ ubiupdatevol /dev/$kern_ubivol -s $kernel_length - } local root_ubivol="$(nand_find_volume $ubidev rootfs)" - tar xf $tar_file sysupgrade-$board_name/root -O | \ + tar xf $tar_file ${board_dir}/root -O | \ ubiupdatevol /dev/$root_ubivol -s $rootfs_length - nand_do_upgrade_success