diff mbox series

[wrynose,4/5] fvp:corstone1000-a320: update Corstone-1000 A320 FVP to 11.31

Message ID 20260630124704.301310-5-harsimransingh.tungal@arm.com
State New
Headers show
Series Corstone1000: update 2026.05 Wrynose release docs | expand

Commit Message

Harsimran Singh Tungal June 30, 2026, 12:47 p.m. UTC 
Update the Corstone-1000 with Cortex-A320 FVP recipe to use the
11.31.cs1000_a320_2 release from Arm Developer.

Switch the source URL to the new package layout, add the architecture-specific
download tokens, and update the x86_64 and aarch64 SHA256 checksums.

The new package extracts directly into the FVP install directory, so update the
install step and license paths accordingly.

Signed-off-by: Harsimran Singh Tungal <harsimransingh.tungal@arm.com>
---
 .../fvp/fvp-corstone1000-a320.bb              | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb
index c266abc4..1c2e4933 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb
@@ -2,12 +2,19 @@  require fvp-ecosystem.inc
 
 MODEL = "Corstone-1000-with-Cortex-A320"
 MODEL_CODE = "FVP_Corstone_1000-A320"
-PV = "11.30.27"
+PV = "11.31.cs1000_a320_2"
+FVP_INSTALL_DIR = "${MODEL_CODE}_${PV}"
 
-FVP_AARCH64_SHA256SUM = "a45898fead5549779153263c3544fa1032c285d532275eb678f58cae3317b01f"
-FVP_X86_64_SHA256SUM = "d57b248a1c1bc5a6040605d50af94a5151adc4da26ec9acc456ec86b819ffb76"
+FVP_AARCH64_SHA256SUM = "37b67836ff09089c292c1c78fa23d60f8613a95cf4a768b70f5b4f037ad476ef"
+FVP_X86_64_SHA256SUM = "f84b973efa6a65c76ae7038a281b592836081fea1920eb90fa9ca983f177a1f2"
 
-SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Corstone-IoT/${MODEL}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
+FVP_ARCH:aarch64 = "Linux_armv8"
+FVP_ARCH:x86-64 = "Linux_x86"
+
+FVP_URL_TOKEN:aarch64 = "st=1782487701~exp=2097847701~hmac=f31b5bcea56a5f3ac8cdb3d3bfe7611e5d394987752444c07c82365dc8936338"
+FVP_URL_TOKEN:x86-64 = "st=1782487742~exp=2097847742~hmac=b2e12e26a2481d2c280e93c671f0b941fe9ebce5125a4c85f7d4bc7467f3e8f5"
+
+SRC_URI = "https://developer.arm.com/-/cdn-downloads/FVPs-Corstone-IoT/${MODEL}/${MODEL_CODE}_${PV}_${FVP_ARCH}.tar.gz?__token__=${FVP_URL_TOKEN};subdir=${BP};name=fvp-${HOST_ARCH}"
 SRC_URI[fvp-aarch64.sha256sum] = "${FVP_AARCH64_SHA256SUM}"
 SRC_URI[fvp-x86_64.sha256sum] = "${FVP_X86_64_SHA256SUM}"
 
@@ -15,14 +22,24 @@  SRC_URI[fvp-x86_64.sha256sum] = "${FVP_X86_64_SHA256SUM}"
 UPSTREAM_VERSION_UNKNOWN = "1"
 
 LIC_FILES_CHKSUM = "\
-    file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
-    file://license_terms/third_party_licenses/third_party_licenses.txt;md5=a5ce56e117d0ab63791fbb7c35ec2211 \
+    file://${FVP_INSTALL_DIR}/license_terms/license_agreement.txt;md5=7fde2369510c8bcafaf4cbf42f7aa23a \
+    file://${FVP_INSTALL_DIR}/license_terms/third_party_licenses/third_party_licenses.txt;md5=da95c9d79488fe4b6115bb7f9900b505 \
 "
 
-do_install:append() {
-    # This FVP embeds a Python runtime, so clean up RPATHs and remove pointless static libraries
-    chrpath --delete ${D}${FVPDIR}/python/lib/python*/lib-dynload/*.so
-    find ${D}${FVPDIR}/python/ -name *.a -delete
+do_install() {
+    mkdir --parents ${D}${FVPDIR}/models/${FVP_ARCH_DIR} ${D}${bindir}
+
+    cp --archive --no-preserve=ownership ${S}/${FVP_INSTALL_DIR} ${D}${FVPDIR}/models/${FVP_ARCH_DIR}/
+
+    FVP_DIR="${D}${FVPDIR}/models/${FVP_ARCH_DIR}/${FVP_INSTALL_DIR}"
+
+    stat $FVP_DIR/bin/FVP_* >/dev/null 2>&1 || bbfatal Cannot find FVP binaries in $FVP_DIR/bin
+
+    for FVP in $FVP_DIR/bin/FVP_*; do
+        ln -rs "$FVP" "${D}${bindir}/$(basename "$FVP")"
+    done
 }
 
 COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
+
+INSANE_SKIP:${PN} += "dev-so"