[PATCH 1/2] CI: build trusted-firmware-rmm for qemuarm64

[PATCH 1/2] CI: build trusted-firmware-rmm for qemuarm64

[Jon Mason]

The trusted-firmware-rmm recipe is not currently covered by CI builds.
Since the recipe already supports qemuarm64, add it to the qemuarm64
CI targets to ensure that it is regularly built and checked for
regressions.

Switch the CI image to core-image-minimal to reduce the number of
packages built and improve build times.

Also, disable the buildpaths QA check for trusted-firmware-rmm and
its debug package to work around TMPDIR references in the build
output.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ci/qemuarm64.yml                                             | 4 ++++
 .../trusted-firmware-rmm/trusted-firmware-rmm_0.6.0.bb       | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ci/qemuarm64.yml b/ci/qemuarm64.yml
index 9c696365c05b..8e394c7f5258 100644
--- a/ci/qemuarm64.yml
+++ b/ci/qemuarm64.yml
@@ -6,3 +6,7 @@ header:
     - ci/base.yml
 
 machine: qemuarm64
+
+target:
+  - core-image-minimal
+  - trusted-firmware-rmm
diff --git a/meta-arm/recipes-bsp/trusted-firmware-rmm/trusted-firmware-rmm_0.6.0.bb b/meta-arm/recipes-bsp/trusted-firmware-rmm/trusted-firmware-rmm_0.6.0.bb
index 43585982e917..55d746196b6f 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-rmm/trusted-firmware-rmm_0.6.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-rmm/trusted-firmware-rmm_0.6.0.bb
@@ -44,3 +44,8 @@ do_deploy() {
 }
 
 addtask deploy after do_install
+
+# FIXME - The RMM build embeds TMPDIR paths in the generated binaries.
+# Skip the buildpaths QA check until these references can be removed.
+INSANE_SKIP:${PN} += "buildpaths"
+INSANE_SKIP:${PN}-dbg += "buildpaths"
-- 
2.54.0 (Apple Git-157)

[PATCH 2/2] arm/cot-dt2c: disable version checking

[Jon Mason]

The tooling uses trusted-firmware-a version when attempting to detect a
new release, which results in a fault comparison of:
cot-dt2c                  0.1.0           2.15.0          None da738d5eae93af342fdc4995dd3c05acb4c9d757

The version of cot-dt2c is actually found within the pyproject.toml, see
https://github.com/ARM-software/arm-trusted-firmware/blob/master/tools/cot_dt2c/pyproject.toml#L8

Disable the check to avoid this issue.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb
index 7d9dec485855..8d8ddf06c1af 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb
@@ -12,6 +12,10 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e
 SRCREV = "da738d5eae93af342fdc4995dd3c05acb4c9d757"
 SRCBRANCH = "master"
 
+# The tools use the TF-A source when performing a version check, not
+# the version of this within the source.  So, disable checking
+UPSTREAM_VERSION_UNKNOWN = "1"
+
 inherit python_poetry_core
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.54.0 (Apple Git-157)