[PATCH 1/4] arm/fvps: correct broken versions

[PATCH 1/4] arm/fvps: correct broken versions

[Jon Mason]

With the change to webpages for the FVPs, it is not possible to detect
new versions anymore.  Add UPSTREAM_VERSION_UNKNOWN to avoid the
"UNKNOWN_BORKEN" when running `devtool check-upgrade-status`

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb | 1 -
 meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb        | 3 ++-
 meta-arm/recipes-devtools/fvp/fvp-envelope.inc           | 4 ++--
 meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb              | 3 +++
 meta-arm/recipes-devtools/fvp/fvp-sgi575.bb              | 3 +++
 meta-arm/recipes-devtools/fvp/fvp-tc3.bb                 | 3 +++
 meta-arm/recipes-devtools/fvp/fvp-v3-r1.bb               | 3 +++
 7 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb
index 45fd21fee783..46884520e11d 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba
                     file://license_terms/third_party_licenses/third_party_licenses.txt;md5=c51b57b6a4731881849eb0e2e2b6d799 \
                     file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=abcaafefc7b7a0cdf6664c51f9075c5b"
 
-SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/${PV_URL_SHORT}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
 SRC_URI[fvp-aarch64.sha256sum] = "a380e271f14ce7cf99158018368ac86fe8c305f82c7d332a93eb08bf7a172571"
 SRC_URI[fvp-x86_64.sha256sum] = "0f6d67d834a8ed5dff3c863e0e3545ef39c736405ea8227577ac004cffd66e93"
 
diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
index aef9edde510d..e200d94c78ed 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
@@ -8,7 +8,8 @@ SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloa
 SRC_URI[fvp-aarch64.sha256sum] = "e299e81d5fa8b3d2afee0850fd03be31c1a1c3fad07f79849c63e46ee5e36acc"
 SRC_URI[fvp-x86_64.sha256sum] = "ec34c9564ccb5b1eb62fc2757673343a353db1d116a7cb1b5f82f9d985d99cdf"
 
-UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P<pver>(\d+[\.\-_]*)+)_${FVP_ARCH}\.tgz"
+# 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/third_party_licenses.txt;md5=0c32ac6f58ebff83065105042ab98211"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
index f48d823f60a3..a52691ebc505 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
+++ b/meta-arm/recipes-devtools/fvp/fvp-envelope.inc
@@ -1,8 +1,8 @@
 require fvp-common.inc
 
-HOMEPAGE = "https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms"
+HOMEPAGE = "https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms/Arm%20Architecture%20FVPs"
 
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/ecosystem-models/${PV_URL_SHORT}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
+SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/${PV_URL_SHORT}/${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"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb b/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb
index 56558f83486d..bf5671f09c13 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb
@@ -8,6 +8,9 @@ SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Automotive/$
 SRC_URI[fvp-aarch64.sha256sum] = "297ded55d025772c9ad8497c6a97e0619fc1762dd1236e3ddec14da449f51ca4"
 SRC_URI[fvp-x86_64.sha256sum] = "e2b01fafac9cd560ed7a42f155241971d0cef086404c56bbb44dc6c9bf672e7d"
 
+# 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/third_party_licenses.txt;md5=a3ce84371977a6b9c624408238309a90"
 
diff --git a/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb b/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb
index efdd46f8ef4d..99a9940c37de 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-sgi575.bb
@@ -6,5 +6,8 @@ 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"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-tc3.bb b/meta-arm/recipes-devtools/fvp/fvp-tc3.bb
index e63a848a57e8..2b0f257db6db 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-tc3.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-tc3.bb
@@ -7,5 +7,8 @@ PV = "11.26.16"
 SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Total-Compute/Total-Compute-TC3/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP}"
 SRC_URI[sha256sum] = "1d72b508e5d8b50de0e389140b4930e5de53c48ba0d3e0865ed4d15898610069"
 
+# 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/third_party_licenses.txt;md5=58b552b918d097a8ba802168312d76b2"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-v3-r1.bb b/meta-arm/recipes-devtools/fvp/fvp-v3-r1.bb
index 5a451effafb6..a0de2a5baa6b 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-v3-r1.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-v3-r1.bb
@@ -8,6 +8,9 @@ SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Neoverse-Inf
 SRC_URI[fvp-aarch64.sha256sum] = "6b25961a7dcac99ff5d2c63f297e1598b05e67938d71353b37c82e3d58d7ac3c"
 SRC_URI[fvp-x86_64.sha256sum] = "72f659ee3554ab0330984f35b2d640ea6553bbcbbf77cc485555be14277e4bc3"
 
+# 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/third_party_licenses.txt;md5=9ddd501715f7e1fed82c57b260b020ba"
 
-- 
2.39.5 (Apple Git-154)

[PATCH 2/4] arm/trusted-firmware-a: correct broken git version

[Jon Mason]

Add UPSTREAM_VERSION_UNKNOWN to avoid the "UNKNOWN_BORKEN" when running
`devtool check-upgrade-status`

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb
index 62a5927e8fb4..953f8bf3e878 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb
@@ -20,3 +20,4 @@ SRC_URI += "\
 
 # Not a release recipe, try our hardest to not pull this in implicitly
 DEFAULT_PREFERENCE = "-1"
+UPSTREAM_CHECK_COMMITS = "1"
-- 
2.39.5 (Apple Git-154)

[PATCH 3/4] arm/trusted-services: correct broken git versions

[Jon Mason]

Add UPSTREAM_VERSION_UNKNOWN to avoid the "UNKNOWN_BORKEN" when running
`devtool check-upgrade-status`

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../recipes-security/trusted-services/trusted-services-src.inc   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
index b30b20b6d0fa..b3e01315dffd 100644
--- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
+++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = "file://${S}/license.rst;md5=ea160bac7f690a069c608516b17997f4
 
 S = "${WORKDIR}/git/trusted-services"
 PV ?= "0.0+git"
+UPSTREAM_CHECK_COMMITS = "1"
 
 # DTC, tag "v1.6.1"
 SRC_URI += "git://github.com/dgibson/dtc;name=dtc;protocol=https;branch=main;destsuffix=git/dtc"
-- 
2.39.5 (Apple Git-154)

[PATCH 4/4] arm/execstack: correct broken version

[Jon Mason]

`devtool check-upgrade-status` reports the new version as "20151030.",
which is the last tagged release.  Given that there are a number of
commits since that tag and the tree doesn't appear to be using tagged
released, treat this as a git tree and check the updates appropriately.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-devtools/fvp/execstack-native.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-arm/recipes-devtools/fvp/execstack-native.bb b/meta-arm/recipes-devtools/fvp/execstack-native.bb
index 055d39ed0646..8f22d8bab657 100644
--- a/meta-arm/recipes-devtools/fvp/execstack-native.bb
+++ b/meta-arm/recipes-devtools/fvp/execstack-native.bb
@@ -8,6 +8,10 @@ SRC_URI = "git://git.yoctoproject.org/prelink-cross;protocol=https;branch=master
 SRCREV = "ff2561c02ade96c5d4d56ddd4e27ff064840a176"
 PV = "1.0+git${SRCPV}"
 
+# The last tagged release was 20151030.  Track this as a git tree to
+# see if there are any updates
+UPSTREAM_CHECK_COMMITS = "1"
+
 S = "${WORKDIR}/git"
 
 inherit autotools native
-- 
2.39.5 (Apple Git-154)

Re: [PATCH 1/4] arm/fvps: correct broken versions

[Jon Mason]

On Fri, 18 Apr 2025 09:12:19 -0400, Jon Mason wrote:
> With the change to webpages for the FVPs, it is not possible to detect
> new versions anymore.  Add UPSTREAM_VERSION_UNKNOWN to avoid the
> "UNKNOWN_BORKEN" when running `devtool check-upgrade-status`
> 
> 

Applied, thanks!

[1/4] arm/fvps: correct broken versions
      commit: 8b73456f13505c1efa02510b81e6b2daec04d402
[2/4] arm/trusted-firmware-a: correct broken git version
      commit: 4f343a1d07872a3b76463b97aa16cadc7f859c98
[3/4] arm/trusted-services: correct broken git versions
      commit: 3e7926598dbfd79787ca20f07fe1f6b1f3320ef3
[4/4] arm/execstack: correct broken version
      commit: 757b8e89bdac0305f2532163ce125c23f546c3bb

Best regards,
-- 
Jon Mason <jon.mason@arm.com>