mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ross Burton
2024-07-25 14:19:04 +01:00
committed by Jon Mason
parent e8b60718a8
commit c850a8624c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-systemready/classes/extra_imagedepends_only.bbclass
+2
View File
@@ -23,3 +23,5 @@ do_rootfs[noexec] = "1"
do_image[noexec] = "1" do_image[noexec] = "1"
do_image_complete[noexec] = "1" do_image_complete[noexec] = "1"
do_build[depends] = "" do_build[depends] = ""
IMAGE_CLASSES:remove = "create-spdx-image-3.0"
meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb
+1 -1
View File
@@ -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}/Unicode-TOU;md5=666362dc5dba74f477af0f44fb85bd22 \
file://${COMMON_LICENSE_DIR}/Zlib;md5=87f239f408daca8a157858e192597633 \ 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)" COMPATIBLE_MACHINE = "(fvp-.+|.+-fvp)"
meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc
+2 -1
View File
@@ -2,7 +2,8 @@ SUMMARY = "Arm SystemReady Linux distros installation"
DESCRIPTION = "Arm SystemReady Linux distro CD/DVD images and installation \ DESCRIPTION = "Arm SystemReady Linux distro CD/DVD images and installation \
target disk image" target disk image"
IMAGE_CLASSES:remove = "license_image testimage" IMAGE_CLASSES:remove = "license_image testimage create-spdx-image-3.0"
BUILDHISTORY_FEATURES:remove = "image" BUILDHISTORY_FEATURES:remove = "image"
INHIBIT_DEFAULT_DEPS = "1" INHIBIT_DEFAULT_DEPS = "1"