From patchwork Tue May 17 15:51:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 623188 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r8MM43SFnz9t6F for ; Wed, 18 May 2016 01:53:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=open-mesh-com.20150623.gappssmtp.com header.i=@open-mesh-com.20150623.gappssmtp.com header.b=VzlN1qtM; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b2hIP-0004SE-Aw; Tue, 17 May 2016 15:52:33 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b2hIL-0004LO-CG for lede-dev@lists.infradead.org; Tue, 17 May 2016 15:52:30 +0000 Received: by mail-wm0-x22f.google.com with SMTP id n129so146256895wmn.1 for ; Tue, 17 May 2016 08:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pl4ay12S1v96T7+RYMeeTLi1lThYemxZ9A5/nbGOf80=; b=VzlN1qtMd5bTBke0dgYmG90g4B07aOY2sIP4BCNXamEkpED0baDzyOeP1jxraCDitU dKyry5H1HonJiIoJtLyXDumHTdoLvk/f7PuVJNNNn8DnAESM0BKXxkh/6TivdZeYiO2S ApzYBgIvRSf5YKFzb4I0kyiXSq65AAbWhRFfujj0A1ezoXm/lhXCdDFHShLqG+o/B98r JFNDYjGEz7brEtt1PBze8wfT95gkrLUDAmqYLORn5wJp1i/nNSgzAaLd4mfxRl1oADkz 2UoVSIzb0L6iJO4tHtt/zNtGll68QmfaukGCoo0ApfC+J+DzAaUeyc6pEox3rwEFxXOA UQIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pl4ay12S1v96T7+RYMeeTLi1lThYemxZ9A5/nbGOf80=; b=BQMYFvBvtj/qjQcmtA5RdZDHt25tzNdKLiPlQNP8rvXOYD5m9tZjygglREV80NMhtw fnllTzgZRMNc6teN+yPa0nxKj/i1yBmykGy62bYYuflKystHuGTuwxx7ahBvhmupi0HS 0UUzH36qeL3lKyXA18LmfTqMFjkZcqgBbqKFmPBmJa2eb/i9lyqpQHFyAcgIMcRHSen2 HSN84fOs9KAd4FPaBSVaW5xe23FRKM9LC+QwEtopnleVfZry+usb0Gkli/NE3ESJ8OLp V0OsfYg2jjipJ6HzeWCXMdZZSdIZz0z5+9i+c5Z77E+5S/lT4f+WchRSJun6Q8ceFeqz v3Xw== X-Gm-Message-State: AOPr4FWjSotA3CvuTJ4c0yCQ4j3WNtnsZvt2SLRcAtyqeCVEWeuj0/FpCnv94qXDsHkMeFeD X-Received: by 10.194.200.65 with SMTP id jq1mr2560962wjc.21.1463500328372; Tue, 17 May 2016 08:52:08 -0700 (PDT) Received: from sven-desktop.home.narfation.org (p549BC98B.dip0.t-ipconnect.de. [84.155.201.139]) by smtp.gmail.com with ESMTPSA id gk4sm3812894wjd.7.2016.05.17.08.52.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 May 2016 08:52:07 -0700 (PDT) From: Sven Eckelmann To: lede-dev@lists.infradead.org Date: Tue, 17 May 2016 17:51:36 +0200 Message-Id: <1463500296-21346-4-git-send-email-sven.eckelmann@open-mesh.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463500296-21346-1-git-send-email-sven.eckelmann@open-mesh.com> References: <1463500296-21346-1-git-send-email-sven.eckelmann@open-mesh.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160517_085229_598376_7B823D9D X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22f listed in] [list.dnswl.org] 1.0 FSL_HELO_HOME No description available. 0.8 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH 4/4] ar71xx: Allow OpenMesh CE images with more than 3 files X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Eckelmann MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The CE image format used by OpenMesh can contain extra blocks which are not used for flashing. Only the first three embedded images (fwupgrade.cfg, kernel, rootfs) are required in this order to successfully flash an image via sysupgrade. All extra embedded images should be ignored for the available devices. Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh index e026946..bc362a7 100644 --- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh @@ -108,7 +108,7 @@ platform_check_image_openmesh() platform_check_image_target_openmesh "$img_board_target" || return 1 - [ $img_num_files -ne 3 ] && { + [ $img_num_files -lt 3 ] && { echo "Invalid number of embedded images ($img_num_files). Use the correct image for this platform" return 1 }