From patchwork Sun Dec 17 14:18:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849628 X-Patchwork-Delegate: noltari@gmail.com 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="I0YEmMVX"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MIUg6Xk1"; 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 3z05rn0BT4z9s4q for ; Mon, 18 Dec 2017 01:19:21 +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:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=edzHqnmBC4uh3Z3wFubvT8As5Uwa7l53vO2clS13HKw=; b=I0YEmMVXvLFGBt L9tcR8ASXqaRxGoJEjVYU+mPf9h9D4bV66BIYzqMrCrLTP3krPtZonLQMEp+YZsmmPOu1hE1GZU5D x2F7MNF+bi8tiMbEuv7I7QHINzNJ36TAz2oF7ETaNi3ujSZVC7xRlk31fCfV7KhwEcIxBDNOjjmu4 nIAmj3t3IiXS8zwn9/eA5bIWzp9D6E0NcGXyPM/mAObA/OoZt1DMbFE+pxblQkxMmSg10T21SZyqi ZgBk/jwAQ8BdJtdoL6bq7Ho1j7CvqU4Ukb6LdsO7rnD7NufN4lHyQOVg4S07Va0afXxKqi9g4hO7q 41R6sqMVB87R12HLMkpA==; 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 1eQZmf-0002WP-Uz; Sun, 17 Dec 2017 14:19:17 +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 1eQZmb-0002Tf-HC for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:19:15 +0000 Received: by mail-wr0-x244.google.com with SMTP id z104so2872138wrb.2 for ; Sun, 17 Dec 2017 06:18:52 -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; bh=sclripMz9MJRjez7GpIvcvhGq5SoewKBEKaHKn2ABbc=; b=MIUg6Xk1b4naGtG/jthP1g+mpvuDiTcxDklBrRrAGV+qrA9HdqhfY0nNHJyujtn3Ee FiRFEuThVsp9B89Oqfd1Zf+4Y6u9wO8QVGqGoka9Dyn4ySZSzEc1THJHea5B17QiJcX9 /MywVysDlNeS+ic04hSiO8K9cjwfPo+gU8ZGVKVHF1jGg4g5+n9I96uOEyNO87wUv9xw voq3X+O9XtzSaLIi44Sk4Bn0Q0YBFQOnN+WjPo8Ao+MLOkHvR6HtAy1uCpt6Skju4obJ dYQTjP7PvmfSd8+hEmI7rQO8yQAHCTO5KsZkC9AW9xk5iCD8k3GP1+aNSn6mInnje77B zczQ== 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; bh=sclripMz9MJRjez7GpIvcvhGq5SoewKBEKaHKn2ABbc=; b=oxST55DYd7icJW3Co19uW4Lg9AUd7D1fs63nnzG/5QrRU85Gw4TQYGKFLrfpxlXfQn nVweXk0HpXC8drUMwbGLS6JWFJwX8FcSSYoYWwoq0yaCQMuYH4pOqDYA6xIE6I2voVnL IqcpvzPXF+GbNLGeSe8sN88NyOHpjfse1fan+ufdisFMcZ8my18KpMqNyNUsGLn+up2j 3RodD6L9BjEdvwk2xv+JOOtqpKF9vfwmalAGHZYN/jmNkOV4J94ugJePeoTotaAqWoRP psEPvNs0YBAwkBWz593DsweUDbazSTtXT/Yjvp3+NcpI9STxDVSrk2JVHMRBRKYsp7CH 1EvQ== X-Gm-Message-State: AKGB3mJlmjy3jZkCT5tQLZPasPoSENqXase89ET9VUXrBv3nTBTQjLuN OgW+xHk+LxMaxZREtcuMkF/K3VQe X-Google-Smtp-Source: ACJfBoudZhQvj8a4xYS66NCo4Rr5H0d2YjqCK57xDHWFZaVw6+lN+7+0GK9MoCyRnPyl3rFL74elWg== X-Received: by 10.223.144.201 with SMTP id i67mr13775722wri.163.1513520331024; Sun, 17 Dec 2017 06:18:51 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id r64sm9505441wrb.62.2017.12.17.06.18.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:18:50 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZmD-0002FO-MY; Sun, 17 Dec 2017 15:18:49 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 15:18:46 +0100 Message-Id: X-Mailer: git-send-email 2.15.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_061913_840656_4F67802B X-CRM114-Status: UNSURE ( 9.64 ) X-CRM114-Notice: Please train this message. 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 1/4] brcm2708: convert to metadata 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: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch converts all the raspberrypi images to utilize the common metadata-based image verification. Note: the CM1 and CM3 currently use the same "rpi-cm" boardname. Signed-off-by: Christian Lamparter --- .../linux/brcm2708/base-files/lib/upgrade/platform.sh | 17 ++--------------- target/linux/brcm2708/image/Makefile | 7 +++++-- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh index b7613b446d..5b8e1e15b3 100644 --- a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh +++ b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh @@ -1,20 +1,7 @@ -get_magic_at() { - local file="$1" - local pos="$2" - get_image "$file" | dd bs=1 count=2 skip="$pos" 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"' -} +REQUIRE_IMAGE_METADATA=1 platform_check_image() { - local file="$1" - local magic - - magic=$(get_magic_at "$file" 510) - [ "$magic" != "55aa" ] && { - echo "Failed to verify MBR boot signature." - return 1 - } - - return 0; + return 0 } platform_do_upgrade() { diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index 7909c6d814..41730b6803 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -50,13 +50,14 @@ define Device/Default FILESYSTEMS := ext4 KERNEL := kernel-bin | kernel-img KERNEL_IMG := kernel.img - IMAGES := sdcard.img - IMAGE/sdcard.img := boot-img | sdcard-img + IMAGES := sdcard.img.gz + IMAGE/sdcard.img.gz := boot-img | sdcard-img | gzip | append-metadata endef define Device/rpi DEVICE_TITLE := Raspberry Pi B/B+/CM/Zero/ZeroW DEVICE_DTS := bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm bcm2708-rpi-0-w + SUPPORTED_DEVICES := rpi-b rpi-b-plus rpi-cm rpi-zero-w endef ifeq ($(SUBTARGET),bcm2708) TARGET_DEVICES += rpi @@ -65,6 +66,7 @@ endif define Device/rpi-2 DEVICE_TITLE := Raspberry Pi 2B/3B/3CM DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-cm3 + SUPPORTED_DEVICES := rpi-2-b rpi-3-b rpi-cm endef ifeq ($(SUBTARGET),bcm2709) TARGET_DEVICES += rpi-2 @@ -74,6 +76,7 @@ define Device/rpi-3 KERNEL_IMG := kernel8.img DEVICE_TITLE := Raspberry Pi 3B (64 bit) DEVICE_DTS := broadcom/bcm2710-rpi-3-b + SUPPORTED_DEVICES := rpi-3-b endef ifeq ($(SUBTARGET),bcm2710) TARGET_DEVICES += rpi-3