From patchwork Tue May 17 15:52:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 623187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r8MM31CmWz9t6F for ; Wed, 18 May 2016 01:53:51 +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=mqKL35jX; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B4E49B91DD1; Tue, 17 May 2016 17:52:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Tue, 17 May 2016 17:52:50 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 91287B91DB9 for ; Tue, 17 May 2016 17:52:41 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .open-mesh. - helo: .mail-wm0-f48.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 17 May 2016 17:52:41 +0200 (CEST) Received: by mail-wm0-f48.google.com with SMTP id e201so145799826wme.0 for ; Tue, 17 May 2016 08:52:41 -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=mqKL35jX2NAUI5ASHAFgteRGRX48Qq2+wqFRk/2QieW9FPj3aacPU6A6+o2D3/ls0y vNZhCN3YPj/mM0PE/of1OOVm+2o9NwchyxMpcVu/LOAetq7tiVmn85ku22YLpoN3q6wh G5okC3OG3+Z3tENzOKnlM4i+zk+Rmxr+2VkndnkAq32ZA49TpIuZBPTTPEeBzDZozFK7 Df8zXsiKTEGMb4gpHXovmsmKI+OnaXWZMFjgfbvKRdzZbFkviFEM4SdMnZiQcKM+28Sn GQ7J0rIrfPrsL9ylWcb8HvtqVS13DFYUDLKtMQqGqCKI7Y0MeCAcs3SUGnhgI/ii80Pw emIw== 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=KV1o1b+ZfB3PyOcwFbFSsS5FPZmI5Qga6pJKXdLYa3XvPLnFrESpa0o93T3iUtkTXE LfMGBlZTIznBOMQxZQiHFOf2nNhrBfsl4dgyjj5UCvJ0VtfNUwoI0roftJr68s3a4XDn o5iNBns/KXcJ5XEiNEyTOyKTOXUIlOZatDOcun2tpTynfYft8yKA1MrS/wTK+YcYaPkC DgFsGKzb3YzFSZNlrtNxcTlr5V1woyyb8v5JOwMm9l5UkQPSYnonrYvJp7dI0+e9Ey7+ VhVXEl6jDbA9gbW4irbfEwOtwfjRIZa59LTGTUnGhIRn58YbedQmUiW4C935Db8CSFrQ 8VEA== X-Gm-Message-State: AOPr4FUJuBCgohBk0FwpAij+lzClmVYh9oiHHYE4fYJb2spNMvou7oCxGOi9AIukLKmEKGbm X-Received: by 10.194.139.65 with SMTP id qw1mr2272283wjb.19.1463500360996; Tue, 17 May 2016 08:52:40 -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 ju3sm3829270wjb.11.2016.05.17.08.52.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 May 2016 08:52:40 -0700 (PDT) From: Sven Eckelmann To: openwrt-devel@lists.openwrt.org Date: Tue, 17 May 2016 17:52:27 +0200 Message-Id: <1463500347-21432-4-git-send-email-sven.eckelmann@open-mesh.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463500347-21432-1-git-send-email-sven.eckelmann@open-mesh.com> References: <1463500347-21432-1-git-send-email-sven.eckelmann@open-mesh.com> Subject: [OpenWrt-Devel] [PATCH 4/4] ar71xx: Allow OpenMesh CE images with more than 3 files X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Eckelmann MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 }