From a130541e92578eaee7cbe8a1e4ade9b48b134a15 Mon Sep 17 00:00:00 2001 From: Gyorgy Szing Date: Tue, 23 Apr 2024 18:32:01 +0200 Subject: [PATCH] arm/devtools/fvp-base-a-aem: update the AEM FVP to 11.25.15 Version v11.25 was released and it fixes measured boot. Update the recipe and integrate the new version. The pattern of the download URL has changed. Add functionality to calculate a new URL fragment from the package version. Signed-off-by: Gyorgy Szing Signed-off-by: Jon Mason --- ...p-base-a-aem_11.24.11.bb => fvp-base-a-aem_11.25.15.bb} | 4 ++-- meta-arm/recipes-devtools/fvp/fvp-common.inc | 7 +++++++ meta-arm/recipes-devtools/fvp/fvp-envelope.inc | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) rename meta-arm/recipes-devtools/fvp/{fvp-base-a-aem_11.24.11.bb => fvp-base-a-aem_11.25.15.bb} (74%) diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.24.11.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb similarity index 74% rename from meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.24.11.bb rename to meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb index fe89e01f..4dd254a2 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.24.11.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba file://license_terms/third_party_licenses/third_party_licenses.txt;md5=b9005e55057311e41efe02ccfea8ea72 \ file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=c09526c02e631abb95ad61528892552d" -SRC_URI[fvp-aarch64.sha256sum] = "7a3593dafd3af6897b3a0a68f66701201f8f3e02a3d981ba47494b2f18853648" -SRC_URI[fvp-x86_64.sha256sum] = "0f132334834cbc66889a62dd72057c976d7c7dfcfeec21799e9c78fb2ce24720" +SRC_URI[fvp-aarch64.sha256sum] = "22096fc2267ad776abe0ff32d0d3b870c9fae10036d9c16f4f0fe4a64487a11e" +SRC_URI[fvp-x86_64.sha256sum] = "5f33707a1bdaa96a933b89949f28643110ad80ac9835a75f139c200b64a394dc" MODEL_CODE = "FVP_Base_RevC-2xAEMvA" diff --git a/meta-arm/recipes-devtools/fvp/fvp-common.inc b/meta-arm/recipes-devtools/fvp/fvp-common.inc index a20959b7..29de89f2 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-common.inc +++ b/meta-arm/recipes-devtools/fvp/fvp-common.inc @@ -29,10 +29,17 @@ def get_real_pv(d): pv = d.getVar("PV") return "%s.%s_%s" % tuple(pv.split(".")) +def get_fm_short_pv_url(d): + # FVP versions are like 11.12_43 + pv = d.getVar("PV") + return "FM_%s_%s" % tuple(pv.split("."))[:2] + + # If PV is 1.2.3, VERSION=1.2, BUILD=3, PV_URL=1.2_3. VERSION = "${@oe.utils.trim_version(d.getVar('PV', -1))}" BUILD = "${@d.getVar('PV').split('.')[-1]}" PV_URL = "${@get_real_pv(d)}" +PV_URL_SHORT="${@get_fm_short_pv_url(d)}" # The directory the FVP is installed into FVPDIR = "${libdir}/fvp/${BPN}" diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc index 1e8bb407..f48d823f 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc +++ b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc @@ -2,7 +2,7 @@ require fvp-common.inc HOMEPAGE = "https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${PV_URL_SHORT}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" UPSTREAM_CHECK_URI = "${HOMEPAGE}" UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P(\d+[\.\-_]*)+).tgz"