From patchwork Wed May 1 12:31:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 43029 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 E0B3BC4345F for ; Wed, 1 May 2024 12:31:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.11413.1714566715311741322 for ; Wed, 01 May 2024 05:31:55 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 223672F4 for ; Wed, 1 May 2024 05:32:21 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D5AD83F73F for ; Wed, 1 May 2024 05:31:54 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Date: Wed, 1 May 2024 08:31:51 -0400 Message-Id: <20240501123154.62576-1-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) 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 ; Wed, 01 May 2024 12:31:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5680 Currently, 'devtool check-upgrade-status' returns UNKNOWN_BROKEN. Add regex to return the correct value. Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb index bd840967314e..9a1086fc5b24 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a" SRCREV = "edc6681206c1a8791981a2f911d2fb8b3d2f5768" +UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P\d+)$" + S = "${WORKDIR}/git" inherit native From patchwork Wed May 1 12:31:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 43028 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 0FDD4C41513 for ; Wed, 1 May 2024 12:32:00 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.11414.1714566715580771727 for ; Wed, 01 May 2024 05:31:55 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 5B59E339 for ; Wed, 1 May 2024 05:32:21 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1AEAF3F73F for ; Wed, 1 May 2024 05:31:55 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/4] arm/boot-wrapper-aarch64: add to fvp-base CI Date: Wed, 1 May 2024 08:31:52 -0400 Message-Id: <20240501123154.62576-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240501123154.62576-1-jon.mason@arm.com> References: <20240501123154.62576-1-jon.mason@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 ; Wed, 01 May 2024 12:32:00 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5681 Add boot-wrapper-aarch64 to fvp-base CI so that it can be covered by CI and added to the update-report Signed-off-by: Jon Mason --- ci/fvp-base.yml | 4 ++++ .../boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend | 1 + 2 files changed, 5 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend diff --git a/ci/fvp-base.yml b/ci/fvp-base.yml index d71d33e4e449..bbc6c44db3be 100644 --- a/ci/fvp-base.yml +++ b/ci/fvp-base.yml @@ -7,3 +7,7 @@ header: - ci/fvp.yml machine: fvp-base + +target: + - core-image-sato + - boot-wrapper-aarch64 diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend new file mode 100644 index 000000000000..0e2812eab52d --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend @@ -0,0 +1 @@ +COMPATIBLE_MACHINE:fvp-base = "fvp-base" From patchwork Wed May 1 12:31:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 43031 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 0F1B0C25B10 for ; Wed, 1 May 2024 12:32:00 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.11415.1714566715752145807 for ; Wed, 01 May 2024 05:31:55 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 952412F4 for ; Wed, 1 May 2024 05:32:21 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5442B3F73F for ; Wed, 1 May 2024 05:31:55 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/4] arm/fvp-corstone1000: tweak the versioning Date: Wed, 1 May 2024 08:31:53 -0400 Message-Id: <20240501123154.62576-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240501123154.62576-1-jon.mason@arm.com> References: <20240501123154.62576-1-jon.mason@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 ; Wed, 01 May 2024 12:32:00 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5682 Modify the versioning to get it to play nice with `devtool check-upgrade-status` Signed-off-by: Jon Mason --- meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb index 4ac9a6ca5d7a..aef9edde510d 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb @@ -2,12 +2,14 @@ require fvp-ecosystem.inc MODEL = "Corstone-1000" MODEL_CODE = "FVP_Corstone_1000" -PV = "11.23_25" +PV = "11.23.25" -SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/${MODEL}/${MODEL_CODE}_${PV}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" +SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/${MODEL}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" SRC_URI[fvp-aarch64.sha256sum] = "e299e81d5fa8b3d2afee0850fd03be31c1a1c3fad07f79849c63e46ee5e36acc" SRC_URI[fvp-x86_64.sha256sum] = "ec34c9564ccb5b1eb62fc2757673343a353db1d116a7cb1b5f82f9d985d99cdf" +UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P(\d+[\.\-_]*)+)_${FVP_ARCH}\.tgz" + LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses/third_party_licenses.txt;md5=0c32ac6f58ebff83065105042ab98211" From patchwork Wed May 1 12:31:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 43030 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 3DF3CC25B5F for ; Wed, 1 May 2024 12:32:00 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.11342.1714566716090962899 for ; Wed, 01 May 2024 05:31:56 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 CE10B339 for ; Wed, 1 May 2024 05:32:21 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8DD823F73F for ; Wed, 1 May 2024 05:31:55 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] arm/fvp-base-a-aem: disable version checking Date: Wed, 1 May 2024 08:31:54 -0400 Message-Id: <20240501123154.62576-4-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240501123154.62576-1-jon.mason@arm.com> References: <20240501123154.62576-1-jon.mason@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 ; Wed, 01 May 2024 12:32:00 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5683 Recent changes to the FVP Base homepage have caused it to no longer be searchable with the current Yocto tooling. Disable it to prevent issues with `devtool check-upgrade-status`. Signed-off-by: Jon Mason --- meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb index 4dd254a21f2e..eab2255f6f3c 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb @@ -8,6 +8,9 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba SRC_URI[fvp-aarch64.sha256sum] = "22096fc2267ad776abe0ff32d0d3b870c9fae10036d9c16f4f0fe4a64487a11e" SRC_URI[fvp-x86_64.sha256sum] = "5f33707a1bdaa96a933b89949f28643110ad80ac9835a75f139c200b64a394dc" +# The CSS used in the FVP homepage make it too difficult to query with the tooling currently in Yocto +UPSTREAM_VERSION_UNKNOWN = "1" + MODEL_CODE = "FVP_Base_RevC-2xAEMvA" COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"