diff mbox series

arm-systemready: explicitly disable SPDX in the fake image classes

Message ID 20240725131904.1934149-1-ross.burton@arm.com
State New
Headers show
Series arm-systemready: explicitly disable SPDX in the fake image classes | expand

Commit Message

Ross Burton July 25, 2024, 1:19 p.m. UTC
If SPDX 3.0 has been enabled then it :appends to IMAGE_CLASSES and then
breaks at build time because there are several classes and recipes that
look like but are not images.

Explicitly :remove the relevant class, but this really needs a better
solution in the long term.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-systemready/classes/extra_imagedepends_only.bbclass   | 2 ++
 .../recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb | 2 +-
 .../arm-systemready-linux-distros.inc                          | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

Comments

Jon Mason July 26, 2024, 5:26 p.m. UTC | #1
On Thu, 25 Jul 2024 14:19:04 +0100, Ross Burton wrote:
> If SPDX 3.0 has been enabled then it :appends to IMAGE_CLASSES and then
> breaks at build time because there are several classes and recipes that
> look like but are not images.
> 
> Explicitly :remove the relevant class, but this really needs a better
> solution in the long term.
> 
> [...]

Applied, thanks!

[1/1] arm-systemready: explicitly disable SPDX in the fake image classes
      commit: c850a8624cf2415c15c50fdd773440c21c779e2d

Best regards,
diff mbox series

Patch

diff --git a/meta-arm-systemready/classes/extra_imagedepends_only.bbclass b/meta-arm-systemready/classes/extra_imagedepends_only.bbclass
index bf06a9f4..224b724e 100644
--- a/meta-arm-systemready/classes/extra_imagedepends_only.bbclass
+++ b/meta-arm-systemready/classes/extra_imagedepends_only.bbclass
@@ -23,3 +23,5 @@  do_rootfs[noexec] = "1"
 do_image[noexec] = "1"
 do_image_complete[noexec] = "1"
 do_build[depends] = ""
+
+IMAGE_CLASSES:remove = "create-spdx-image-3.0"
diff --git a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb b/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb
index 7a709af5..83257b30 100644
--- a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb
+++ b/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb
@@ -39,7 +39,7 @@  file://${COMMON_LICENSE_DIR}/Unicode-DFS-2016;md5=907371994d651afe53e98adc278246
 file://${COMMON_LICENSE_DIR}/Unicode-TOU;md5=666362dc5dba74f477af0f44fb85bd22 \
 file://${COMMON_LICENSE_DIR}/Zlib;md5=87f239f408daca8a157858e192597633 \
 "
-IMAGE_CLASSES:remove = "license_image"
+IMAGE_CLASSES:remove = "license_image create-spdx-image-3.0"
 
 COMPATIBLE_MACHINE = "(fvp-.+|.+-fvp)"
 
diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc
index 24dfc50a..fdca3cc0 100644
--- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc
+++ b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc
@@ -2,7 +2,8 @@  SUMMARY = "Arm SystemReady Linux distros installation"
 DESCRIPTION = "Arm SystemReady Linux distro CD/DVD images and installation \
                target disk image"
 
-IMAGE_CLASSES:remove = "license_image testimage"
+IMAGE_CLASSES:remove = "license_image testimage create-spdx-image-3.0"
+
 BUILDHISTORY_FEATURES:remove = "image"
 
 INHIBIT_DEFAULT_DEPS = "1"