From patchwork Tue Dec 7 18:19:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1054 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A15AC433F5 for ; Tue, 7 Dec 2021 18:20:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.863.1638901202630082570 for ; Tue, 07 Dec 2021 10:20:02 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 067FF13A1 for ; Tue, 7 Dec 2021 10:20:01 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A60F53F73B for ; Tue, 7 Dec 2021 10:20:00 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/5] arm/trusted-firmware-a: move SRCREV_FORMAT to common include Date: Tue, 7 Dec 2021 18:19:53 +0000 Message-Id: <20211207181956.900131-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207181956.900131-1-ross.burton@arm.com> References: <20211207181956.900131-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Dec 2021 18:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2557 Instead of every versioned recipe setting this, move it to the common include. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 2 ++ .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 40c9e9e3..b1a75229 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -9,6 +9,8 @@ SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=ht file://ssl.patch" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P\d+(\.\d+)+)$" +SRCREV_FORMAT = "tfa" + COMPATIBLE_MACHINE ?= "invalid" # Platform must be set for each machine diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb index 15e689a8..15c4e5df 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bb @@ -1,8 +1,5 @@ require trusted-firmware-a.inc -# Use TF-A for version -SRCREV_FORMAT = "tfa" - # TF-A v2.5 SRCREV_tfa = "1e13c500a0351ac4b55d09a63f7008e2438550f8"