From patchwork Thu Dec 6 15:25:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Thibault X-Patchwork-Id: 1008838 X-Patchwork-Delegate: blogic@openwrt.org 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=navigue.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="X7BNJHAr"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 439fbH50HSz9s4s for ; Fri, 7 Dec 2018 02:26:51 +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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qui+HLEc3/YY/bmNSk2bxS+bKdmgoQB9Fct4W7rflkE=; b=X7BNJHAreozvcy 946jMbA0RtbNX5Y2JKHY9nlS+N7Wh1iq20WitfpjtoR7Dpp4Xjo8YilYL6KbYFTQTKYFfx5A56rGX IPQsTsEgQtUOkIYWgfd7ynJpLgShYHuI7t4zNxgceTQtiha9nDXvT8iiSvcs4BCGvXq2wnCr3MkYC lwe8dL4vC5PW9dK0aY1v4AufrL1r6f91z9Qx0hrtEsItIcW2EwKWicLbDeumXoR0J32ZABZ5QCjzU O76fPaqQYV2R6qaz2LO8I+Wm+o6cXyPdGG7odk+ktkUczOLeE2/YHsaARMH9atX4I3nOCNmbAVCGK jQmHztgUKN/bMSeIWZeQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUvY2-0003J2-W1; Thu, 06 Dec 2018 15:26:42 +0000 Received: from mail.navigue.com ([74.117.40.3]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUvXz-0003Ht-TA for openwrt-devel@lists.openwrt.org; Thu, 06 Dec 2018 15:26:41 +0000 Received: from mako (bureau.navigue.com [74.117.40.10]) by mail.navigue.com (Postfix) with SMTP id 0FC5C1A01EC; Thu, 6 Dec 2018 10:26:25 -0500 (EST) Received: by mako (sSMTP sendmail emulation); Thu, 06 Dec 2018 10:26:25 -0500 From: Jonathan Thibault To: openwrt-devel@lists.openwrt.org Date: Thu, 6 Dec 2018 10:25:35 -0500 Message-Id: <20181206152536.38850-2-jonathan@navigue.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20181206152536.38850-1-jonathan@navigue.com> References: <20181206152536.38850-1-jonathan@navigue.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181206_072640_055521_6697B31D X-CRM114-Status: UNSURE ( 7.40 ) 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 http://www.dnswl.org/, no trust [74.117.40.3 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH v5 1/2] Evaluate board names in alphabetical order X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Thibault MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org --- target/linux/octeon/base-files/lib/upgrade/platform.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh index cd49c0da36..6d258dbb0f 100755 --- a/target/linux/octeon/base-files/lib/upgrade/platform.sh +++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh @@ -62,12 +62,12 @@ platform_do_upgrade() { [ -b "${rootfs}" ] || return 1 case "$board" in - erlite) - kernel=sda1 - ;; er) kernel=mmcblk0p1 ;; + erlite) + kernel=sda1 + ;; *) return 1 esac @@ -82,8 +82,8 @@ platform_check_image() { local board=$(board_name) case "$board" in - erlite | \ - er) + er | \ + erlite) local tar_file="$1" local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null` local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null`