diff mbox series

arm-bsp/fvp-base: update version to 11.26.11

Message ID 20240619205650.22335-1-jon.mason@arm.com
State New
Headers show
Series arm-bsp/fvp-base: update version to 11.26.11 | expand

Commit Message

Jon Mason June 19, 2024, 8:56 p.m. UTC 
Update to the latest version of fvp-base-a-aem.  The licence files
changed with an addition of language to add 'Arm License Management
Utilities', but still is licensed under the Arm Proprietary license (and
still requires the EULA to be acknowledged).

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ...se-a-aem_11.25.15.bb => fvp-base-a-aem_11.26.11.bb} | 10 ++++++----
 meta-arm/recipes-devtools/fvp/fvp-common.inc           |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
 rename meta-arm/recipes-devtools/fvp/{fvp-base-a-aem_11.25.15.bb => fvp-base-a-aem_11.26.11.bb} (51%)

Comments

Jon Mason June 21, 2024, 12:57 p.m. UTC | #1 
On Wed, 19 Jun 2024 16:56:50 -0400, Jon Mason wrote:
> Update to the latest version of fvp-base-a-aem.  The licence files
> changed with an addition of language to add 'Arm License Management
> Utilities', but still is licensed under the Arm Proprietary license (and
> still requires the EULA to be acknowledged).
> 
> 

Applied, thanks!

[1/1] arm-bsp/fvp-base: update version to 11.26.11
      commit: 794262c783e2a644598f13f4afcc9ede3c9f32f3

Best regards,
diff mbox series

Patch

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.26.11.bb
similarity index 51%
rename from meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb
rename to meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.26.11.bb
index eab2255f6f3c..54c7e0fd0579 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.26.11.bb
@@ -2,11 +2,13 @@  require fvp-envelope.inc
 
 SUMMARY = "Arm Fixed Virtual Platform - Armv-A Base RevC Architecture Envelope Model FVP"
 LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
-                    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"
+                    file://license_terms/third_party_licenses/third_party_licenses.txt;md5=58b552b918d097a8ba802168312d76b2 \
+                    file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=abcaafefc7b7a0cdf6664c51f9075c5b"
 
-SRC_URI[fvp-aarch64.sha256sum] = "22096fc2267ad776abe0ff32d0d3b870c9fae10036d9c16f4f0fe4a64487a11e"
-SRC_URI[fvp-x86_64.sha256sum] = "5f33707a1bdaa96a933b89949f28643110ad80ac9835a75f139c200b64a394dc"
+
+SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/${PV_URL_SHORT}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
+SRC_URI[fvp-aarch64.sha256sum] = "0a262327073d410146a6689c068162f60e72f45845734650b08a1d45483853ca"
+SRC_URI[fvp-x86_64.sha256sum] = "a314f0f8c55492b70ab469fbbe2bb71ab8bb7c7ae4608ed1c432d8de8f4edb27"
 
 # The CSS used in the FVP homepage make it too difficult to query with the tooling currently in Yocto
 UPSTREAM_VERSION_UNKNOWN = "1"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-common.inc b/meta-arm/recipes-devtools/fvp/fvp-common.inc
index 29de89f2226f..477c45f4117e 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-common.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-common.inc
@@ -32,7 +32,7 @@  def get_real_pv(d):
 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]
+    return "FM-%s.%s" % tuple(pv.split("."))[:2]
 
 
 # If PV is 1.2.3, VERSION=1.2, BUILD=3, PV_URL=1.2_3.