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

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>
Signed-off-by: Jon Mason <jon.mason@arm.com>

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"

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)"
 

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"