* [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums
@ 2023-01-09 17:20 Ross Burton
2023-01-09 17:20 ` [PATCH 2/4] arm/fvp-envelope: update HOMEPAGE Ross Burton
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Ross Burton @ 2023-01-09 17:20 UTC (permalink / raw)
To: meta-arm; +Cc: nd
We can download both x86-64 and aarch64 binaries, so ensure the SRC_URI
entry is named to identify them.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb | 2 +-
meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb | 2 +-
meta-arm/recipes-devtools/fvp/fvp-envelope.inc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb
index 6545a6ef..85c752bc 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb
@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba
file://license_terms/third_party_licenses/third_party_licenses.txt;md5=34a1ba318d745f05e6197def68ea5411 \
file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=2e53bda6ff2db4c35d69944b93926c9f"
-SRC_URI[sha256sum] = "f9db2076e3a63e2f8eb2ea9ed60f30db04e5f81f535bc7e3ed24e270d857ea6f"
+SRC_URI[fvp-x86_64.sha256sum] = "f9db2076e3a63e2f8eb2ea9ed60f30db04e5f81f535bc7e3ed24e270d857ea6f"
MODEL_CODE = "FVP_Base_RevC-2xAEMvA"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb
index f5175b2c..3f8139ca 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem_11.20.15.bb
@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba
file://license_terms/third_party_licenses/third_party_licenses.txt;md5=34a1ba318d745f05e6197def68ea5411 \
file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=2e53bda6ff2db4c35d69944b93926c9f"
-SRC_URI[sha256sum] = "c252616489b79fffa3bb721255b1c99ff4ee8c38e4beebce4fa05862a3195fe9"
+SRC_URI[fvp-x86_64.sha256sum] = "c252616489b79fffa3bb721255b1c99ff4ee8c38e4beebce4fa05862a3195fe9"
MODEL_CODE = "FVP_Base_AEMv8R"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
index 887d9d27..2884bb56 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-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models"
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP}"
+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
UPSTREAM_CHECK_URI = "${HOMEPAGE}"
UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P<pver>(\d+[\.\-_]*)+).tgz"
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] arm/fvp-envelope: update HOMEPAGE
2023-01-09 17:20 [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Ross Burton
@ 2023-01-09 17:20 ` Ross Burton
2023-01-09 17:20 ` [PATCH 3/4] arm/fvp-base-a-aem: add support for aarch64 binaries Ross Burton
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2023-01-09 17:20 UTC (permalink / raw)
To: meta-arm; +Cc: nd
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta-arm/recipes-devtools/fvp/fvp-envelope.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
index 2884bb56..1e8bb407 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
@@ -1,6 +1,6 @@
require fvp-common.inc
-HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms/arm-ecosystem-models"
+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}"
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] arm/fvp-base-a-aem: add support for aarch64 binaries
2023-01-09 17:20 [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Ross Burton
2023-01-09 17:20 ` [PATCH 2/4] arm/fvp-envelope: update HOMEPAGE Ross Burton
@ 2023-01-09 17:20 ` Ross Burton
2023-01-09 17:20 ` [PATCH 4/4] CI: don't pin fvp-base jobs to x86-64 Ross Burton
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2023-01-09 17:20 UTC (permalink / raw)
To: meta-arm; +Cc: nd
There is now a beta release of the Base-A AEM FVP for aarch64!
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb
index 85c752bc..4c62822e 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.20.15.bb
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba
file://license_terms/third_party_licenses/third_party_licenses.txt;md5=34a1ba318d745f05e6197def68ea5411 \
file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=2e53bda6ff2db4c35d69944b93926c9f"
+SRC_URI[fvp-aarch64.sha256sum] = "e14e6cbd5c3ec8e1e2e79965e994c9235e136480e102f5c43de31162263b6361"
SRC_URI[fvp-x86_64.sha256sum] = "f9db2076e3a63e2f8eb2ea9ed60f30db04e5f81f535bc7e3ed24e270d857ea6f"
MODEL_CODE = "FVP_Base_RevC-2xAEMvA"
+
+COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] CI: don't pin fvp-base jobs to x86-64
2023-01-09 17:20 [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Ross Burton
2023-01-09 17:20 ` [PATCH 2/4] arm/fvp-envelope: update HOMEPAGE Ross Burton
2023-01-09 17:20 ` [PATCH 3/4] arm/fvp-base-a-aem: add support for aarch64 binaries Ross Burton
@ 2023-01-09 17:20 ` Ross Burton
2023-01-10 18:27 ` [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Jon Mason
2023-01-13 18:05 ` Jon Mason
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2023-01-09 17:20 UTC (permalink / raw)
To: meta-arm; +Cc: nd
Now that the FVP is available for both aarch64 and x86-64, don't set a
tag so this can run on both architectures.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.gitlab-ci.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29254b92..09ca8c41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,8 +97,6 @@ fvp-base:
parallel:
matrix:
- TESTING: testimage
- tags:
- - x86_64
fvp-base-arm32:
extends: .build
@@ -106,8 +104,6 @@ fvp-base-arm32:
matrix:
- TOOLCHAINS: [gcc, external-gccarm]
TESTING: testimage
- tags:
- - x86_64
fvp-baser-aemv8r64:
extends: .build
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums
2023-01-09 17:20 [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Ross Burton
` (2 preceding siblings ...)
2023-01-09 17:20 ` [PATCH 4/4] CI: don't pin fvp-base jobs to x86-64 Ross Burton
@ 2023-01-10 18:27 ` Jon Mason
2023-01-13 18:05 ` Jon Mason
4 siblings, 0 replies; 6+ messages in thread
From: Jon Mason @ 2023-01-10 18:27 UTC (permalink / raw)
To: meta-arm, Ross Burton; +Cc: nd
On Mon, 9 Jan 2023 17:20:19 +0000, Ross Burton wrote:
> We can download both x86-64 and aarch64 binaries, so ensure the SRC_URI
> entry is named to identify them.
Applied, thanks!
[1/4] arm/fvp-envelope: name the FVP tarballs for checksums
commit: 8015efe2f1b23c90277f2995cdd2700c6cfb11dd
[2/4] arm/fvp-envelope: update HOMEPAGE
commit: befd9f1567b105c5f3173ddb7d668fc73b923840
[3/4] arm/fvp-base-a-aem: add support for aarch64 binaries
commit: 0c4bfbe40aeaee89d09f9a076c5b650bf2166e8e
[4/4] CI: don't pin fvp-base jobs to x86-64
commit: ddc67dc4bb254ff2adad4266ffbf73aa8008adf5
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums
2023-01-09 17:20 [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Ross Burton
` (3 preceding siblings ...)
2023-01-10 18:27 ` [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Jon Mason
@ 2023-01-13 18:05 ` Jon Mason
4 siblings, 0 replies; 6+ messages in thread
From: Jon Mason @ 2023-01-13 18:05 UTC (permalink / raw)
To: meta-arm, Ross Burton; +Cc: nd
On Mon, 9 Jan 2023 17:20:19 +0000, Ross Burton wrote:
> We can download both x86-64 and aarch64 binaries, so ensure the SRC_URI
> entry is named to identify them.
Applied, thanks!
[1/4] arm/fvp-envelope: name the FVP tarballs for checksums
commit: 8015efe2f1b23c90277f2995cdd2700c6cfb11dd
[2/4] arm/fvp-envelope: update HOMEPAGE
commit: befd9f1567b105c5f3173ddb7d668fc73b923840
[3/4] arm/fvp-base-a-aem: add support for aarch64 binaries
commit: 0c4bfbe40aeaee89d09f9a076c5b650bf2166e8e
[4/4] CI: don't pin fvp-base jobs to x86-64
commit: ddc67dc4bb254ff2adad4266ffbf73aa8008adf5
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-13 18:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-09 17:20 [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Ross Burton
2023-01-09 17:20 ` [PATCH 2/4] arm/fvp-envelope: update HOMEPAGE Ross Burton
2023-01-09 17:20 ` [PATCH 3/4] arm/fvp-base-a-aem: add support for aarch64 binaries Ross Burton
2023-01-09 17:20 ` [PATCH 4/4] CI: don't pin fvp-base jobs to x86-64 Ross Burton
2023-01-10 18:27 ` [PATCH 1/4] arm/fvp-envelope: name the FVP tarballs for checksums Jon Mason
2023-01-13 18:05 ` Jon Mason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).