From patchwork Sun Dec 17 14:00:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849627 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="CF3d11Jc"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IOWSGhsS"; 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 3z05Ty2mPMz9t2Z for ; Mon, 18 Dec 2017 01:03:02 +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=az554RobHKXK35ew7m7xbM71LvMVXBtkohA1NY6GFLU=; b=CF3d11JcD+LpDy eCcv7j7YDb9I2MOXiYqpWJfIXiKzUTDbHcTGufKs7jpZvVwasccysD8dpG+iTD0BlGdmDbEbz9drJ PIXacW9gT8/ggO7m2uUsi6JsJpyMBzanmhnwapkZI1Pwuyc1dSqlatwBIapcPa8IwOT79xXp7xYsY DPgVvAxrHOTF/JGUcl+nqZBpg8QrDNSb9HZ2XZcREFGhKhvVXQfTVLFduYfcKdU4obxGVl86O+MvW VmoyQH7dTafx6dQ9Kh6ysI2PyyNkUUP9tVcw7ryIkBfb1YlJF5O1ofGpK/BE94k6gTgWPznRGRQ8J BI+XYaei8kCHwYz3IUIA==; 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 1eQZWu-0004AW-Q9; Sun, 17 Dec 2017 14:03:00 +0000 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUY-0002Mj-HW for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:38 +0000 Received: by mail-wr0-x244.google.com with SMTP id w95so911350wrc.11 for ; Sun, 17 Dec 2017 06:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=TR7raDyBFcSLH05DWNJGHc2PwclkU0AGZNon5ULhtmU=; b=IOWSGhsSaHnqnJvLy4285S3Oc1ua3ctQXS4v1MkZdTqF7kNflaJeOq/sXFXuucYWe9 X1Yd6UJdzk/g1Bq/rhznEcyHnSnH5HpsiZM6Q1eTJj/Y4X99SuINA4Y4U472fzACnDCA C0aH1ojmn3ivsFYSxdjoEMxtCnivXtERw7uipk5ti+RQTxLwryA29XYyr3ah8T93W10S fVSG3ZZLXiVojuoucTDYLdrBhQBuuHoO6XHE0zJvei29TtozJyLsDdcVWK4SobMun8wx 7ni+VQj76ci9wd2pRZ1BSMEweNg12OETYIUpQdllDHMiKoRJrtfvWZFN7pAK4iAPbq7E wZJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=TR7raDyBFcSLH05DWNJGHc2PwclkU0AGZNon5ULhtmU=; b=WHfuB0fM8N/vgBQmaNY2Dx/25HDMySrHDaM2G9c3wr0Q6hBsmes296FJZ5jT7w6233 EABMpctENr6xFuVjy7p6zcrXPlBlI0KSZHxfdeomGV5+GMlgV3jpev1kGJZFBwTdrDTv Xaww5QMTklPcxPSQd9RmaLIHOGGfBUNA/NqnphrE7vVh6pg0Z6DLP1kZvtacs9NmThc9 uGe+S4ajqwGyAFYWLbk5DhQwCtZybrIIi69Riy58AvnBTYJ8L3Ep29OcQcV0IIY7vqmp FaDyB5meLA0jysE7rVFjWIxpvDWlRbVz2QFbqJCWFHsPTsm+NR3dgxM63Yr2scvIsetD 9X/g== X-Gm-Message-State: AKGB3mIbslBRN53Duc07V7yCuly5eBN6rH7x/f84let+52Y/tHI2rvq5 SgRGhwzHzwx+P41l5OSS7AQZYBXv X-Google-Smtp-Source: ACJfBousLDecdXJRP3AxJEj7VdJWmu4hXSAN+DAKnmidEauZrJnKKxmjUGLOnwzQKdrkdVZdGufkHw== X-Received: by 10.223.169.135 with SMTP id b7mr14112313wrd.171.1513519208812; Sun, 17 Dec 2017 06:00:08 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id o98sm8565951wrb.40.2017.12.17.06.00.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:03 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001mH-Ex; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 15:00:00 +0100 Message-Id: <4a2fcf1e56ff3f8dd84399788c66e13dea0e7c04.1513455854.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060034_886496_3842538B X-CRM114-Status: GOOD ( 10.56 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:244 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 8/9] apm821xx: enable metadata for packaging 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: , Cc: Mathias Kresin MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch enables metadata-supported image verification for all apm821xx supported devices. Since this method comes with a built-in image verification tool (fwtool), the previous image checks can be removed. Signed-off-by: Mathias Kresin Signed-off-by: Christian Lamparter --- .../apm821xx/base-files/lib/upgrade/merakinand.sh | 68 ---------------------- .../apm821xx/base-files/lib/upgrade/platform.sh | 15 ++--- target/linux/apm821xx/image/Makefile | 9 +-- 3 files changed, 9 insertions(+), 83 deletions(-) delete mode 100755 target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh diff --git a/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh b/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh deleted file mode 100755 index fb961b8945..0000000000 --- a/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2016 Chris Blake -# -# Custom upgrade script for Meraki NAND devices (ex. MR24) -# Based on merakinand.sh from the ar71xx target -# -. /lib/apm821xx.sh -. /lib/functions.sh - -merakinand_do_kernel_check() { - local board_name="$1" - local tar_file="$2" - local image_magic_word=`(tar xf $tar_file sysupgrade-$board_name/kernel -O 2>/dev/null | dd bs=1 count=4 skip=0 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"')` - - # What is our kernel magic string? - case "$board_name" in - "mr24"|\ - "mx60") - [ "$image_magic_word" == "8e73ed8a" ] && { - echo "pass" && return 0 - } - ;; - esac - - exit 1 -} - -merakinand_do_platform_check() { - local board_name="$1" - local tar_file="$2" - local control_length=`(tar xf $tar_file sysupgrade-$board_name/CONTROL -O | wc -c) 2> /dev/null` - local file_type="$(identify_tar $2 sysupgrade-$board_name/root)" - local kernel_magic="$(merakinand_do_kernel_check $1 $2)" - - case "$board_name" in - "mr24"|\ - "mx60") - [ "$control_length" = 0 -o "$file_type" != "squashfs" -o "$kernel_magic" != "pass" ] && { - echo "Invalid sysupgrade file for $board_name" - return 1 - } - ;; - *) - echo "Unsupported device $board_name"; - return 1 - ;; - esac - - return 0 -} - -merakinand_do_upgrade() { - local tar_file="$1" - local board_name="$(board_name)" - - # Do we need to do any platform tweaks? - case "$board_name" in - "mr24"|\ - "mx60") - nand_do_upgrade $1 - ;; - *) - echo "Unsupported device $board_name"; - exit 1 - ;; - esac -} diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh index 8c716bf44e..ecfd70b9ee 100755 --- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh @@ -1,6 +1,7 @@ #!/bin/sh PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 platform_check_image() { local board=$(board_name) @@ -14,14 +15,9 @@ platform_check_image() { ;; mr24|\ - mx60) - merakinand_do_platform_check $board "$1" - return $?; - ;; - + mx60|\ wndr4700) - nand_do_platform_check $board "$1" - return $?; + return 0; ;; *) @@ -37,10 +33,7 @@ platform_pre_upgrade() { case "$board" in mr24|\ - mx60) - merakinand_do_upgrade "$1" - ;; - + mx60|\ wndr4700) nand_do_upgrade "$1" ;; diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index bff3947039..251ef5f359 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -14,6 +14,7 @@ define Device/Default KERNEL_ENTRY := 0x00000000 KERNEL_LOADADDR := 0x00000000 DEVICE_DTS_DIR := ../dts + SUPPORTED_DEVICES = $$(BOARD_NAME) endef define Build/dtb @@ -81,7 +82,7 @@ define Device/meraki_mr24 check-size $$(KERNEL_SIZE) | \ MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | \ MerakiNAND - IMAGE/sysupgrade.tar := sysupgrade-tar + IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata UBINIZE_OPTS := -E 5 endef TARGET_DEVICES += meraki_mr24 @@ -106,7 +107,7 @@ define Device/meraki_mx60 check-size $$(KERNEL_SIZE) | \ MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | \ MerakiNAND - IMAGE/sysupgrade.tar := sysupgrade-tar + IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata UBINIZE_OPTS := -E 5 endef TARGET_DEVICES += meraki_mx60 @@ -170,7 +171,7 @@ define Device/netgear_wndr4700 KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip IMAGE/factory.img := create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \ netgear-dni | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.tar := sysupgrade-tar + IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata IMAGE/kernel.dtb := export-dtb | uImage none NETGEAR_BOARD_ID := WNDR4700 NETGEAR_HW_ID := 29763875+128+256 @@ -219,7 +220,7 @@ define Device/MyBookLiveDefault DEVICE_DTB := apollo3g.dtb FILESYSTEMS := ext4 IMAGE/kernel.dtb := export-dtb - IMAGE/rootfs.img.gz := boot-script | boot-img | hdd-img | gzip + IMAGE/rootfs.img.gz := boot-script | boot-img | hdd-img | gzip | append-metadata endef define Device/wd_mybooklive