[PATCH 01/12] arm/fvp: don't inhibit default dependencies

[PATCH 01/12] arm/fvp: don't inhibit default dependencies

[Ross Burton]

The FVPs are precompiled binaries so we can theoretically avoid the
default dependencies (gcc and friends), but this means that packaging
doesn't succeed for non-native builds as objcopy (from binutils-cross)
is needed during do_package.

Until oe-core is fixed to depend on binutils-cross, don't disable the
default dependencies.

Change-Id: I9ec292d21c4f9db4e02587b7f58f46852cbc2c3d
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-common.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-common.inc b/meta-arm/recipes-devtools/fvp/fvp-common.inc
index d6fbf871..82b82675 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-common.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-common.inc
@@ -31,6 +31,4 @@ INSANE_SKIP:${PN} += "file-rdeps"
 # FVP brings its own standard library so don't let it be used as a shlib provider
 PRIVATE_LIBS = "libgcc_s.so.1 libstdc++.so.6"
 
-INHIBIT_DEFAULT_DEPS = "1"
-
 BBCLASSEXTEND = "native nativesdk"
-- 
2.25.1

[PATCH 02/12] arm/fvp-base-*: factor out commonality to fvp-envelope.inc

[Ross Burton]

The fvp-base-a-aem and fvp-base-r-aem recipes have a lot in common, so
extract that into a fvp-envelope.inc file.

Change-Id: I9390f05e98bec0c1a236bc3c5d55b7144da1e1fd
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb | 11 +----------
 meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb | 11 +----------
 meta-arm/recipes-devtools/fvp/fvp-envelope.inc  | 11 +++++++++++
 3 files changed, 13 insertions(+), 20 deletions(-)
 create mode 100644 meta-arm/recipes-devtools/fvp/fvp-envelope.inc

diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
index facf8215..1d4e2a39 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
@@ -1,7 +1,6 @@
-require fvp-common.inc
+require fvp-envelope.inc
 
 SUMMARY = "Arm Fixed Virtual Platform - Armv-A Base RevC Architecture Envelope Model FVP"
-HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models"
 LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
                     file://license_terms/third_party_licenses.txt;md5=b40ecbbbd3409d48263437b782df6df9"
 
@@ -16,11 +15,3 @@ python() {
     if not d.getVar("FVP_BASE_A_AEM_TARBALL_URI"):
         raise bb.parse.SkipRecipe("FVP_BASE_A_AEM_TARBALL_URI not set")
 }
-
-do_install() {
-    mkdir --parents ${D}${FVPDIR} ${D}${bindir}
-
-    cp --archive --no-preserve=ownership ${S}/Base_RevC_AEMvA_pkg/* ${D}${FVPDIR}/
-
-    fvp_link_binaries
-}
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
index 50e6402a..67c5564e 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
@@ -1,7 +1,6 @@
-require fvp-common.inc
+require fvp-envelope.inc
 
 SUMMARY = "Arm Fixed Virtual Platform - Armv8-R Base Architecture Envelope Model FVP"
-HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models"
 LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
                     file://license_terms/third_party_licenses.txt;md5=3db0c4947b7e3405c40b943672d8de2f"
 
@@ -16,11 +15,3 @@ python() {
     if not d.getVar("FVP_BASE_R_AEM_TARBALL_URI"):
         raise bb.parse.SkipRecipe("FVP_BASE_R_AEM_TARBALL_URI not set")
 }
-
-do_install() {
-    mkdir --parents ${D}${FVPDIR} ${D}${bindir}
-
-    cp --archive --no-preserve=ownership ${S}/AEMv8R_base_pkg//* ${D}${FVPDIR}/
-
-    fvp_link_binaries
-}
diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
new file mode 100644
index 00000000..eda98762
--- /dev/null
+++ b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
@@ -0,0 +1,11 @@
+require fvp-common.inc
+
+HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models"
+
+do_install() {
+    mkdir --parents ${D}${FVPDIR} ${D}${bindir}
+
+    cp --archive --no-preserve=ownership ${S}/*_pkg/* ${D}${FVPDIR}/
+
+    fvp_link_binaries
+}
-- 
2.25.1

[PATCH 03/12] arm/fvp-base-a-aem: use public SRC_URI

[Ross Burton]

This FVP is now freely available without a login, so we can download it
directly.

Change-Id: I8ba041c44233cfbba5e3c223f07acc531a2e5f5c
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
index 1d4e2a39..22907ad9 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
@@ -2,16 +2,9 @@ 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.txt;md5=b40ecbbbd3409d48263437b782df6df9"
+                    file://license_terms/third_party_licenses.txt;md5=3db0c4947b7e3405c40b943672d8de2f"
 
-# This FVP cannot be downloaded directly, so download the Armv-A Base RevC AEM
-# FVP yourself from the homepage and set FVP_BASE_A_AEM_TARBALL_URI appropriately
-# (for example, file:///home/user/FVP_Base_RevC-2xAEMvA_11.14_21.tgz).
-FVP_BASE_A_AEM_TARBALL_URI ?= ""
-PV = "11.14_21"
+PV = "11.15_18"
 
-SRC_URI = "${FVP_BASE_A_AEM_TARBALL_URI};subdir=${BP}"
-python() {
-    if not d.getVar("FVP_BASE_A_AEM_TARBALL_URI"):
-        raise bb.parse.SkipRecipe("FVP_BASE_A_AEM_TARBALL_URI not set")
-}
+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_RevC-2xAEMvA_${PV}.tgz;subdir=${BP}"
+SRC_URI[sha256sum] = "05e474d6b8197c749c66968315fdb7059d398b279bef59787025a88219c71ae4"
-- 
2.25.1

[PATCH 04/12] arm/fvp-common: store the mangled PV as PV_URL

[Ross Burton]

FVP versions in the download URLs are expressed as 11.12_13, but ideally
we'll use a rationalised 11.12.13 form as it's more consistant.

Add a function to transform from a all-dots form to use underscore for
the final portion, and expose this version as PV_URL.

Change-Id: I632b33913baba0f0847440595ef0699d0a769166
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-common.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-common.inc b/meta-arm/recipes-devtools/fvp/fvp-common.inc
index 82b82675..83e03131 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-common.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-common.inc
@@ -9,6 +9,12 @@ LICENSE = "Proprietary & Apache-2.0 & Python-2.0 & GPL-3.0-with-GCC-exception &
 COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
 FVP_ARCH = "Linux64_GCC-6.4"
 
+def get_real_pv(d):
+    # FVP versions are like 11.12_43
+    pv = d.getVar("PV")
+    return "%s.%s_%s" % tuple(pv.split("."))
+PV_URL = "${@get_real_pv(d)}"
+
 # The directory the FVP is installed into
 FVPDIR = "${libdir}/fvp/${BPN}"
 
-- 
2.25.1

[PATCH 05/12] arm/fvp-base-*-aem: use all-dots versions

[Ross Burton]

Change-Id: Ie1a5f2de6dcdd1331914798f072ce752e4de1532
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb | 4 ++--
 meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
index 22907ad9..6b1e020d 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
@@ -4,7 +4,7 @@ SUMMARY = "Arm Fixed Virtual Platform - Armv-A Base RevC Architecture Envelope M
 LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
                     file://license_terms/third_party_licenses.txt;md5=3db0c4947b7e3405c40b943672d8de2f"
 
-PV = "11.15_18"
+PV = "11.15.18"
 
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_RevC-2xAEMvA_${PV}.tgz;subdir=${BP}"
+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_RevC-2xAEMvA_${PV_URL}.tgz;subdir=${BP}"
 SRC_URI[sha256sum] = "05e474d6b8197c749c66968315fdb7059d398b279bef59787025a88219c71ae4"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
index 67c5564e..6c612ab6 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba
 # yourself from the homepage and set FVP_BASE_R_AEM_TARBALL_URI appropriately
 # (for example, file:///home/user/FVP_Base_AEMv8R_11.15_14.tgz).
 FVP_BASE_R_AEM_TARBALL_URI ?= ""
-PV = "11.15_14"
+PV = "11.15.14"
 
 SRC_URI = "${FVP_BASE_R_AEM_TARBALL_URI};subdir=${BP}"
 python() {
-- 
2.25.1

[PATCH 06/12] arm/fvp-ecosystem: use all-dots versions

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc | 2 +-
 meta-arm/recipes-devtools/fvp/fvp-n1-edge.bb    | 2 +-
 meta-arm/recipes-devtools/fvp/fvp-sgi575.bb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc b/meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc
index a5463155..100f6a23 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc
@@ -8,7 +8,7 @@ PV ?= "unset"
 SUMMARY = "Arm Fixed Virtual Platform - ${MODEL} Ecosystem Reference Design"
 HOMEPAGE = "https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps"
 
-SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/${MODEL}/${MODEL_CODE}_${PV}.tgz;subdir=${BP}"
+SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/${MODEL}/${MODEL_CODE}_${PV_URL}.tgz;subdir=${BP}"
 
 LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
                     file://license_terms/third_party_licenses.txt;md5=47473b1e04b70938cf0a7ffea8ea4cc3"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-n1-edge.bb b/meta-arm/recipes-devtools/fvp/fvp-n1-edge.bb
index edda411c..27493730 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-n1-edge.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-n1-edge.bb
@@ -2,6 +2,6 @@ require fvp-ecosystem.inc
 
 MODEL = "Neoverse-N1"
 MODEL_CODE = "FVP_RD_N1_edge"
-PV = "11.12_43"
+PV = "11.12.43"
 
 SRC_URI[sha256sum] = "e428cc44db251202bf45ae68d40832d01efbc5d0f1323f1ce46237213dd4f0fa"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb b/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb
index 2ad1d3af..6750907d 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb
@@ -2,6 +2,6 @@ require fvp-ecosystem.inc
 
 MODEL = "SGI-575"
 MODEL_CODE = "FVP_CSS_SGI-575"
-PV = "11.12_59"
+PV = "11.12.59"
 
 SRC_URI[sha256sum] = "86c7a16d83b0801278b4a3d05c8d42c4955ed22a0dbea3c583798fb971bc425c"
-- 
2.25.1

[PATCH 07/12] arm/fvp: add upstream version checking

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb | 4 +++-
 meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc | 3 +++
 meta-arm/recipes-devtools/fvp/fvp-envelope.inc  | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
index 6b1e020d..2ef85995 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem.bb
@@ -6,5 +6,7 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba
 
 PV = "11.15.18"
 
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_RevC-2xAEMvA_${PV_URL}.tgz;subdir=${BP}"
+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${MODEL_CODE}_${PV_URL}.tgz;subdir=${BP}"
 SRC_URI[sha256sum] = "05e474d6b8197c749c66968315fdb7059d398b279bef59787025a88219c71ae4"
+
+MODEL_CODE = "FVP_Base_RevC-2xAEMvA"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc b/meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc
index 100f6a23..ef01bdc1 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-ecosystem.inc
@@ -13,6 +13,9 @@ SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloa
 LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
                     file://license_terms/third_party_licenses.txt;md5=47473b1e04b70938cf0a7ffea8ea4cc3"
 
+UPSTREAM_CHECK_URI = "${HOMEPAGE}"
+UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P<pver>(\d+[\.\-_]*)+).tgz"
+
 do_install() {
     mkdir --parents ${D}${FVPDIR} ${D}${bindir}
 
diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
index eda98762..4f6bb370 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
@@ -2,6 +2,9 @@ require fvp-common.inc
 
 HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models"
 
+UPSTREAM_CHECK_URI = "${HOMEPAGE}"
+UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P<pver>(\d+[\.\-_]*)+).tgz"
+
 do_install() {
     mkdir --parents ${D}${FVPDIR} ${D}${bindir}
 
-- 
2.25.1

[PATCH 08/12] arm/fvp: add corstone500 FVP

[Ross Burton]

Change-Id: I70e745a2bb7328c8abcb950340d99e9fc39d754a
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-corstone500.bb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 meta-arm/recipes-devtools/fvp/fvp-corstone500.bb

diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone500.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone500.bb
new file mode 100644
index 00000000..14704145
--- /dev/null
+++ b/meta-arm/recipes-devtools/fvp/fvp-corstone500.bb
@@ -0,0 +1,7 @@
+require fvp-ecosystem.inc
+
+MODEL = "Corstone-500"
+MODEL_CODE = "FVP_Corstone_500"
+PV = "11.12.59"
+
+SRC_URI[sha256sum] = "26f0fbb52de2ccdb4c7b40b6f4ddb5eabdcb8173775fdd11c9a12173326f8614"
-- 
2.25.1

[PATCH 09/12] arm/fvp: add corstone700 FVP

[Ross Burton]

Change-Id: Ia3a80cf34aeb2e4473bc6b6317852e152a5cbcff
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-corstone700.bb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 meta-arm/recipes-devtools/fvp/fvp-corstone700.bb

diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone700.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone700.bb
new file mode 100644
index 00000000..bda96a6b
--- /dev/null
+++ b/meta-arm/recipes-devtools/fvp/fvp-corstone700.bb
@@ -0,0 +1,9 @@
+require fvp-ecosystem.inc
+
+MODEL = "Corstone-700"
+MODEL_CODE = "FVP_Corstone_700"
+PV = "11.10.47"
+
+# Temporary SRC_URI as the URL structure is unconventional
+SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/${MODEL}/Corstone-700-updated-11-10-47/${MODEL_CODE}_${PV_URL}.tgz;subdir=${BP}"
+SRC_URI[sha256sum] = "255207771864edeca2610958811d30e458c03a2db01950355a455513bad782ec"
-- 
2.25.1

[PATCH 10/12] arm/fvp: add Total Compute FVP

[Ross Burton]

Change-Id: Iaeff2027ac055519d30d160c97b905974b85567b
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-tc0.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 meta-arm/recipes-devtools/fvp/fvp-tc0.bb

diff --git a/meta-arm/recipes-devtools/fvp/fvp-tc0.bb b/meta-arm/recipes-devtools/fvp/fvp-tc0.bb
new file mode 100644
index 00000000..bdcd5cab
--- /dev/null
+++ b/meta-arm/recipes-devtools/fvp/fvp-tc0.bb
@@ -0,0 +1,10 @@
+require fvp-ecosystem.inc
+
+MODEL = "TotalCompute"
+MODEL_CODE = "FVP_TC0"
+PV = "11.15.20"
+
+SRC_URI[sha256sum] = "792ddb425eba0714a1590aa8e404845b7654758c663745693216ae1343ceef2d"
+
+LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=a50d186fffa51ed55599183aad911298 \
+                    file://license_terms/third_party_licenses.txt;md5=3db0c4947b7e3405c40b943672d8de2f"
-- 
2.25.1

[PATCH 11/12] CI: add FVP-EULA to the license whitelist

[Ross Burton]

So that we can build and use FVP packages in the CI, agree to the FVP
EULA.

Change-Id: Iaff2398000c30782f48f70714846d3f1028b34bb
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ci/base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/base.yml b/ci/base.yml
index 99360a63..86608b28 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -28,7 +28,7 @@ local_conf_header:
   base: |
     CONF_VERSION = "2"
     PACKAGE_CLASSES = "package_ipk"
-    LICENSE_FLAGS_WHITELIST += "armcompiler"
+    LICENSE_FLAGS_WHITELIST += "armcompiler Arm-FVP-EULA"
     PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
     EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
     BB_NUMBER_THREADS = "16"
-- 
2.25.1

[PATCH 12/12] CI: add a job to build the FVP packages

[Ross Burton]

This doesn't execute anything but simply checks that the publically
available FVPs can be downloaded and packaged.

Change-Id: I13895faa6fe6b19363854c33275a3febf61b7132
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml |  3 +++
 ci/fvps.yml    | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 ci/fvps.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae2b3468..8c07a78b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,6 +113,9 @@ fvp-base-arm32/external-gccarm:
 fvp-baser-aemv8r64:
   extends: .build
 
+fvps:
+  extends: .build
+
 gem5-arm64:
   extends: .build
 
diff --git a/ci/fvps.yml b/ci/fvps.yml
new file mode 100644
index 00000000..4087c348
--- /dev/null
+++ b/ci/fvps.yml
@@ -0,0 +1,20 @@
+# Simple target to build the FVPs that are publically available
+
+header:
+  version: 9
+  includes:
+    - base.yml
+
+machine: qemuarm64
+
+local_conf_header:
+  sdk: |
+    SDKMACHINE = "x86_64"
+
+target:
+  - nativesdk-fvp-base-a-aem
+  - nativesdk-fvp-n1-edge
+  - nativesdk-fvp-sgi575
+  - nativesdk-fvp-corstone500
+  - nativesdk-fvp-corstone700
+  - nativesdk-fvp-tc0
-- 
2.25.1