* [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic
@ 2024-05-01 12:31 Jon Mason
2024-05-01 12:31 ` [PATCH 2/4] arm/boot-wrapper-aarch64: add to fvp-base CI Jon Mason
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Jon Mason @ 2024-05-01 12:31 UTC (permalink / raw
To: meta-arm
Currently, 'devtool check-upgrade-status' returns UNKNOWN_BROKEN. Add
regex to return the correct value.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb
index bd840967314e..9a1086fc5b24 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb
+++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb
@@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a"
SRCREV = "edc6681206c1a8791981a2f911d2fb8b3d2f5768"
+UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P<pver>\d+)$"
+
S = "${WORKDIR}/git"
inherit native
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] arm/boot-wrapper-aarch64: add to fvp-base CI
2024-05-01 12:31 [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Jon Mason
@ 2024-05-01 12:31 ` Jon Mason
2024-05-01 12:31 ` [PATCH 3/4] arm/fvp-corstone1000: tweak the versioning Jon Mason
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2024-05-01 12:31 UTC (permalink / raw
To: meta-arm
Add boot-wrapper-aarch64 to fvp-base CI so that it can be
covered by CI and added to the update-report
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
ci/fvp-base.yml | 4 ++++
.../boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend | 1 +
2 files changed, 5 insertions(+)
create mode 100644 meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend
diff --git a/ci/fvp-base.yml b/ci/fvp-base.yml
index d71d33e4e449..bbc6c44db3be 100644
--- a/ci/fvp-base.yml
+++ b/ci/fvp-base.yml
@@ -7,3 +7,7 @@ header:
- ci/fvp.yml
machine: fvp-base
+
+target:
+ - core-image-sato
+ - boot-wrapper-aarch64
diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend
new file mode 100644
index 000000000000..0e2812eab52d
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend
@@ -0,0 +1 @@
+COMPATIBLE_MACHINE:fvp-base = "fvp-base"
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] arm/fvp-corstone1000: tweak the versioning
2024-05-01 12:31 [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Jon Mason
2024-05-01 12:31 ` [PATCH 2/4] arm/boot-wrapper-aarch64: add to fvp-base CI Jon Mason
@ 2024-05-01 12:31 ` Jon Mason
2024-05-01 12:31 ` [PATCH 4/4] arm/fvp-base-a-aem: disable version checking Jon Mason
2024-05-02 14:13 ` [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2024-05-01 12:31 UTC (permalink / raw
To: meta-arm
Modify the versioning to get it to play nice with `devtool check-upgrade-status`
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
index 4ac9a6ca5d7a..aef9edde510d 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb
@@ -2,12 +2,14 @@ require fvp-ecosystem.inc
MODEL = "Corstone-1000"
MODEL_CODE = "FVP_Corstone_1000"
-PV = "11.23_25"
+PV = "11.23.25"
-SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/${MODEL}/${MODEL_CODE}_${PV}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
+SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/${MODEL}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
SRC_URI[fvp-aarch64.sha256sum] = "e299e81d5fa8b3d2afee0850fd03be31c1a1c3fad07f79849c63e46ee5e36acc"
SRC_URI[fvp-x86_64.sha256sum] = "ec34c9564ccb5b1eb62fc2757673343a353db1d116a7cb1b5f82f9d985d99cdf"
+UPSTREAM_CHECK_REGEX = "${MODEL_CODE}_(?P<pver>(\d+[\.\-_]*)+)_${FVP_ARCH}\.tgz"
+
LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
file://license_terms/third_party_licenses/third_party_licenses.txt;md5=0c32ac6f58ebff83065105042ab98211"
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] arm/fvp-base-a-aem: disable version checking
2024-05-01 12:31 [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Jon Mason
2024-05-01 12:31 ` [PATCH 2/4] arm/boot-wrapper-aarch64: add to fvp-base CI Jon Mason
2024-05-01 12:31 ` [PATCH 3/4] arm/fvp-corstone1000: tweak the versioning Jon Mason
@ 2024-05-01 12:31 ` Jon Mason
2024-05-02 14:13 ` [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2024-05-01 12:31 UTC (permalink / raw
To: meta-arm
Recent changes to the FVP Base homepage have caused it to no longer be
searchable with the current Yocto tooling. Disable it to prevent issues
with `devtool check-upgrade-status`.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb
index 4dd254a21f2e..eab2255f6f3c 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.25.15.bb
@@ -8,6 +8,9 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba
SRC_URI[fvp-aarch64.sha256sum] = "22096fc2267ad776abe0ff32d0d3b870c9fae10036d9c16f4f0fe4a64487a11e"
SRC_URI[fvp-x86_64.sha256sum] = "5f33707a1bdaa96a933b89949f28643110ad80ac9835a75f139c200b64a394dc"
+# 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-2xAEMvA"
COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic
2024-05-01 12:31 [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Jon Mason
` (2 preceding siblings ...)
2024-05-01 12:31 ` [PATCH 4/4] arm/fvp-base-a-aem: disable version checking Jon Mason
@ 2024-05-02 14:13 ` Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2024-05-02 14:13 UTC (permalink / raw
To: meta-arm, Jon Mason
On Wed, 01 May 2024 08:31:51 -0400, Jon Mason wrote:
> Currently, 'devtool check-upgrade-status' returns UNKNOWN_BROKEN. Add
> regex to return the correct value.
>
>
Applied, thanks!
[1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic
commit: 54b5c5d1dae177ee18c77d70e4d18fd964a436fd
[2/4] arm/boot-wrapper-aarch64: add to fvp-base CI
commit: 950e191d7b2183c308efdfb10a2c42705776bb6f
[3/4] arm/fvp-corstone1000: tweak the versioning
commit: f9025699f7d1cbbe8125ce57831448e75b8c1b90
[4/4] arm/fvp-base-a-aem: disable version checking
commit: 7889ce020647d4d6a871a377b540c417fcb5d225
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-02 14:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-01 12:31 [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Jon Mason
2024-05-01 12:31 ` [PATCH 2/4] arm/boot-wrapper-aarch64: add to fvp-base CI Jon Mason
2024-05-01 12:31 ` [PATCH 3/4] arm/fvp-corstone1000: tweak the versioning Jon Mason
2024-05-01 12:31 ` [PATCH 4/4] arm/fvp-base-a-aem: disable version checking Jon Mason
2024-05-02 14:13 ` [PATCH 1/4] arm/edk2-basetools: add UPSTREAM_CHECK logic Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.