[PATCH 1/3] arm/fvp: Update FVP Base to 11.32.19

[PATCH 1/3] arm/fvp: Update FVP Base to 11.32.19

[Jon Mason]

Update the fvp-base model recipe to version 11.32.19.

The new release changes the package layout and installation process,
requiring updates to the license checksums, source checksums, install
procedure, and FVP binary linking.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../fvp/fvp-base-a-aem_11.31.28.bb            | 20 -------
 .../fvp/fvp-base-a-aem_11.32.19.bb            | 59 +++++++++++++++++++
 2 files changed, 59 insertions(+), 20 deletions(-)
 delete mode 100644 meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.31.28.bb
 create mode 100644 meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb

diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.31.28.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.31.28.bb
deleted file mode 100644
index 3a4789c57f4e..000000000000
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.31.28.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require fvp-envelope.inc
-
-LICENSE:append = " AND Artistic-2.0 AND BSL-1.0 AND BSD-2-Clause AND Unlicense"
-
-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=5e3a194978d88188b5a0eebd263f2ca8 \
-                    file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=4f61d2f0d834d5c29d53d828572fb6fc"
-
-SRC_URI[fvp-aarch64.sha256sum] = "38cfb5244fe898bed5c3ba46ec6e3654638e29085ef597b9ed92f36be08adf1d"
-SRC_URI[fvp-x86_64.sha256sum] = "527920d1873472de045c844fa6f5b8679511ad4f9996058eb9e075b0f0eada10"
-
-# 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_AEMvA"
-
-COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
-
-INSANE_SKIP:${PN} += "dev-so"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb
new file mode 100644
index 000000000000..26557769a577
--- /dev/null
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb
@@ -0,0 +1,59 @@
+require fvp-ecosystem.inc
+
+LICENSE:append = " AND Artistic-2.0 AND BSL-1.0 AND BSD-2-Clause AND Unlicense"
+
+FVP_ARCH:aarch64 = "Linux_armv8"
+FVP_ARCH:x86-64 = "Linux_x86"
+
+SUMMARY = "Arm Fixed Virtual Platform - Armv-A Base RevC Architecture Envelope Model FVP"
+SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/${PV_URL_SHORT}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tar.gz;subdir=${BP};name=fvp-${HOST_ARCH}"
+
+LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=ac2215fd2c35830a4a52f9f910c6a552 \
+                    file://license_terms/third_party_licenses/third_party_licenses.txt;md5=da95c9d79488fe4b6115bb7f9900b505 \
+                    file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=4f61d2f0d834d5c29d53d828572fb6fc"
+
+SRC_URI[fvp-aarch64.sha256sum] = "c01a1450ee2adee499183026b01f4c31f760081ffdefd5c9a9788ae58d8542ce"
+SRC_URI[fvp-x86_64.sha256sum] = "b6835fd07cb390c7a32f84fe1cead84bde992813b49679137b3a7a0a026e92de"
+
+# 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_AEMvA"
+SHELL_SCRIPT_NAME = "${MODEL_CODE}_11.32_19_${FVP_ARCH}.sh"
+
+COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
+
+INSANE_SKIP:${PN} += "dev-so"
+
+do_install() {
+    mkdir --parents ${D}${FVPDIR}/models/${FVP_ARCH} ${D}${bindir}
+
+    ${S}/${SHELL_SCRIPT_NAME} \
+        --i-agree-to-the-contained-eula \
+        --no-interactive \
+        --allow-existing-dir \
+        --skip-platform-check \
+        --destination ${D}${FVPDIR}
+
+    fvp_link_binaries
+}
+# The new version no longer has any files expect the README and install
+# script.  So, we have to run install before checking the license files
+# for them to be present.
+do_populate_lic[depends] += "${PN}:do_install"
+
+# The files are located in a different directory that expected in
+# fvp-common.inc.  So, doing it uniquely in here
+fvp_link_binaries() {
+    DIR="${D}${FVPDIR}/bin/"
+
+    stat $DIR/FVP_* >/dev/null 2>&1 || bbfatal Cannot find FVP binaries in $DIR
+
+    for FVP in $DIR/FVP_*; do
+        ln -rs $FVP ${D}${bindir}/$(basename $FVP)
+    done
+    # But not the .so files too
+    rm -f ${D}${bindir}/*.so
+
+    cp -r ${D}${FVPDIR}/license_terms ${S}
+}
-- 
2.50.1 (Apple Git-155)

[PATCH 2/3] arm/fvps: remove unused files

[Jon Mason]

fvp-envelope is no longer used and fvp-rdv1 and fvp-sgi575 no longer
have anything referencing them.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../recipes-devtools/fvp/fvp-envelope.inc     | 38 -------------------
 meta-arm/recipes-devtools/fvp/fvp-rdv1.bb     | 14 -------
 meta-arm/recipes-devtools/fvp/fvp-sgi575.bb   | 13 -------
 3 files changed, 65 deletions(-)
 delete mode 100644 meta-arm/recipes-devtools/fvp/fvp-envelope.inc
 delete mode 100644 meta-arm/recipes-devtools/fvp/fvp-rdv1.bb
 delete mode 100644 meta-arm/recipes-devtools/fvp/fvp-sgi575.bb

diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
deleted file mode 100644
index a6a618edb4ea..000000000000
--- a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-require fvp-common.inc
-
-HOMEPAGE = "https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms/Arm%20Architecture%20FVPs"
-
-SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/${PV_URL_SHORT}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tar.gz;subdir=${BP};name=fvp-${HOST_ARCH}"
-
-UPSTREAM_CHECK_URI = "${HOMEPAGE}"
-UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P<pver>(\d+[\.\-_]*)+).tar.gz"
-
-FVP_ARCH:aarch64 = "Linux_armv8"
-FVP_ARCH:x86-64 = "Linux_x86"
-
-# This is needed because all of the files are now included in the first
-# dir in the tarball, instead of having the license files split out.
-S = "${UNPACKDIR}/${BP}/${MODEL_CODE}_${VERSION}_${BUILD}"
-
-# Keeping this separate from do_install below in case it can be moved
-# out when other FVPs bump to newer versions and this because needed more commonly
-fvp_link_binaries() {
-    DIR="${D}${FVPDIR}/bin/"
-
-    stat $DIR/FVP_* >/dev/null 2>&1 || bbfatal Cannot find FVP binaries in $DIR
-
-    for FVP in $DIR/FVP_*; do
-        ln -rs $FVP ${D}${bindir}/$(basename $FVP)
-    done
-    # But not the .so files too
-    rm -f ${D}${bindir}/*.so
-}
-
-# This is needed because the FVP Base doesn't have an install script like others
-do_install() {
-    mkdir --parents ${D}${FVPDIR} ${D}${bindir}
-
-    cp --archive --no-preserve=ownership ${S}/* ${D}${FVPDIR}/
-
-    fvp_link_binaries
-}
diff --git a/meta-arm/recipes-devtools/fvp/fvp-rdv1.bb b/meta-arm/recipes-devtools/fvp/fvp-rdv1.bb
deleted file mode 100644
index 23804bf3fef4..000000000000
--- a/meta-arm/recipes-devtools/fvp/fvp-rdv1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require fvp-ecosystem.inc
-
-MODEL = "RD-V1"
-MODEL_CODE = "FVP_RD_V1"
-PV = "11.17.29"
-
-SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Neoverse-Infrastructure/${MODEL}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
-SRC_URI[fvp-x86_64.sha256sum] = "715c0e0264fc3df961a0b9ff4c4399d55e4ccf4efb0944a412141d97873027a3"
-
-# The CSS used in the FVP homepage make it too difficult to query with the tooling currently in Yocto
-UPSTREAM_VERSION_UNKNOWN = "1"
-
-LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
-                    file://license_terms/third_party_licenses.txt;md5=41029e71051b1c786bae3112a29905a7"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb b/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb
deleted file mode 100644
index 99a9940c37de..000000000000
--- a/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require fvp-ecosystem.inc
-
-MODEL = "SGI-575"
-MODEL_CODE = "FVP_CSS_SGI-575"
-PV = "11.15.26"
-
-SRC_URI[sha256sum] = "d07241112f6c146362deec789e782e10e83bc3560cf605ccd055a606d0b44e74"
-
-# The CSS used in the FVP homepage make it too difficult to query with the tooling currently in Yocto
-UPSTREAM_VERSION_UNKNOWN = "1"
-
-LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
-                    file://license_terms/third_party_licenses.txt;md5=3db0c4947b7e3405c40b943672d8de2f"
-- 
2.50.1 (Apple Git-155)

[PATCH 3/3] arm/fvps: change COMPATIBLE_HOST default

[Jon Mason]

Make the COMPATIBLE_HOST in fvp-common.inc be both x86 and arm64, since
that is the large majority of the FVPs available.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb | 2 --
 meta-arm/recipes-devtools/fvp/fvp-common.inc             | 2 +-
 meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb   | 2 --
 meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb        | 2 --
 meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb              | 2 --
 meta-arm/recipes-devtools/fvp/fvp-rdn2.bb                | 2 --
 meta-arm/recipes-devtools/fvp/fvp-rdv2.bb                | 2 --
 meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb             | 2 --
 meta-arm/recipes-devtools/fvp/fvp-tc3.bb                 | 2 ++
 9 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb
index 26557769a577..59c1ead938ae 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb
@@ -21,8 +21,6 @@ UPSTREAM_VERSION_UNKNOWN = "1"
 MODEL_CODE = "FVP_Base_RevC_AEMvA"
 SHELL_SCRIPT_NAME = "${MODEL_CODE}_11.32_19_${FVP_ARCH}.sh"
 
-COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
-
 INSANE_SKIP:${PN} += "dev-so"
 
 do_install() {
diff --git a/meta-arm/recipes-devtools/fvp/fvp-common.inc b/meta-arm/recipes-devtools/fvp/fvp-common.inc
index 7f7d4ef5126a..7021036f99b9 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-common.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-common.inc
@@ -15,7 +15,7 @@ Please refer to 'https://developer.arm.com/downloads/-/arm-ecosystem-fvps/eula'\
 ${@bb.utils.contains('BB_ENV_PASSTHROUGH_ADDITIONS', 'ARM_FVP_EULA_ACCEPT', ' and export ARM_FVP_EULA_ACCEPT to 1', '', d)}.\
 "
 
-COMPATIBLE_HOST = "x86_64.*-linux"
+COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
 
 # The architecture-specific download filename suffix
 FVP_ARCH:aarch64 = "Linux64_armv8l"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb
index 1c2e49338395..37f44eb2b1d4 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb
@@ -40,6 +40,4 @@ do_install() {
     done
 }
 
-COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
-
 INSANE_SKIP:${PN} += "dev-so"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
index b4288275c8fd..9618bf75f2c8 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
@@ -18,5 +18,3 @@ LIC_FILES_CHKSUM = "\
     file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
     file://license_terms/third_party_licenses/third_party_licenses.txt;md5=0c32ac6f58ebff83065105042ab98211 \
 "
-
-COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb b/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb
index e305afae96c4..c9a1c529a734 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb
@@ -13,5 +13,3 @@ 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=92ea58bb219213dfdc48111b693019b6"
-
-COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-rdn2.bb b/meta-arm/recipes-devtools/fvp/fvp-rdn2.bb
index 73848bfbc4cf..17330974b801 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-rdn2.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-rdn2.bb
@@ -14,7 +14,5 @@ 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=b9005e55057311e41efe02ccfea8ea72"
 
-COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
-
 require remove-execstack.inc
 REMOVE_EXECSTACKS:x86-64 = "${FVPDIR}/models/${FVP_ARCH_DIR}*/libarmctmodel.so"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-rdv2.bb b/meta-arm/recipes-devtools/fvp/fvp-rdv2.bb
index 3da7075abcd0..3ac06880af02 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-rdv2.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-rdv2.bb
@@ -14,7 +14,5 @@ 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=b9005e55057311e41efe02ccfea8ea72"
 
-COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
-
 require remove-execstack.inc
 REMOVE_EXECSTACKS:x86-64 = "${FVPDIR}/models/${FVP_ARCH_DIR}*/libarmctmodel.so"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb b/meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb
index e54f31903147..a7e03e3522b5 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb
@@ -13,5 +13,3 @@ 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=41f1533ebfbd4f1d32cfc82b55f6729a"
-
-COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-tc3.bb b/meta-arm/recipes-devtools/fvp/fvp-tc3.bb
index 2b0f257db6db..1f91d4419f4c 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-tc3.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-tc3.bb
@@ -12,3 +12,5 @@ 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=58b552b918d097a8ba802168312d76b2"
+
+COMPATIBLE_HOST = "x86_64.*-linux"
-- 
2.50.1 (Apple Git-155)