summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes-recipe/create-spdx-image-3.0.bbclass6
-rw-r--r--meta/classes-recipe/create-spdx-sdk-3.0.bbclass4
-rw-r--r--meta/classes/create-spdx-3.0.bbclass6
3 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes-recipe/create-spdx-image-3.0.bbclass b/meta/classes-recipe/create-spdx-image-3.0.bbclass
index e0f1766bb7..636ab14eb0 100644
--- a/meta/classes-recipe/create-spdx-image-3.0.bbclass
+++ b/meta/classes-recipe/create-spdx-image-3.0.bbclass
@@ -36,7 +36,7 @@ do_create_rootfs_spdx[sstate-inputdirs] = "${SPDXROOTFSDEPLOY}"
36do_create_rootfs_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" 36do_create_rootfs_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}"
37do_create_rootfs_spdx[recrdeptask] += "do_create_spdx do_create_package_spdx" 37do_create_rootfs_spdx[recrdeptask] += "do_create_spdx do_create_package_spdx"
38do_create_rootfs_spdx[cleandirs] += "${SPDXROOTFSDEPLOY}" 38do_create_rootfs_spdx[cleandirs] += "${SPDXROOTFSDEPLOY}"
39do_create_rootfs_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" 39do_create_rootfs_spdx[file-checksums] += "${SPDX3_DEP_FILES}"
40 40
41python do_create_rootfs_spdx_setscene() { 41python do_create_rootfs_spdx_setscene() {
42 sstate_setscene(d) 42 sstate_setscene(d)
@@ -54,7 +54,7 @@ do_create_image_spdx[sstate-inputdirs] = "${SPDXIMAGEWORK}"
54do_create_image_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" 54do_create_image_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}"
55do_create_image_spdx[cleandirs] = "${SPDXIMAGEWORK}" 55do_create_image_spdx[cleandirs] = "${SPDXIMAGEWORK}"
56do_create_image_spdx[dirs] = "${SPDXIMAGEWORK}" 56do_create_image_spdx[dirs] = "${SPDXIMAGEWORK}"
57do_create_image_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" 57do_create_image_spdx[file-checksums] += "${SPDX3_DEP_FILES}"
58do_create_image_spdx[vardeps] += "\ 58do_create_image_spdx[vardeps] += "\
59 SPDX_IMAGE_PURPOSE \ 59 SPDX_IMAGE_PURPOSE \
60 " 60 "
@@ -77,7 +77,7 @@ do_create_image_sbom_spdx[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
77do_create_image_sbom_spdx[stamp-extra-info] = "${MACHINE_ARCH}" 77do_create_image_sbom_spdx[stamp-extra-info] = "${MACHINE_ARCH}"
78do_create_image_sbom_spdx[cleandirs] = "${SPDXIMAGEDEPLOYDIR}" 78do_create_image_sbom_spdx[cleandirs] = "${SPDXIMAGEDEPLOYDIR}"
79do_create_image_sbom_spdx[recrdeptask] += "do_create_spdx do_create_package_spdx" 79do_create_image_sbom_spdx[recrdeptask] += "do_create_spdx do_create_package_spdx"
80do_create_image_sbom_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" 80do_create_image_sbom_spdx[file-checksums] += "${SPDX3_DEP_FILES}"
81 81
82python do_create_image_sbom_spdx_setscene() { 82python do_create_image_sbom_spdx_setscene() {
83 sstate_setscene(d) 83 sstate_setscene(d)
diff --git a/meta/classes-recipe/create-spdx-sdk-3.0.bbclass b/meta/classes-recipe/create-spdx-sdk-3.0.bbclass
index 855fb3d09f..e5f220cdfa 100644
--- a/meta/classes-recipe/create-spdx-sdk-3.0.bbclass
+++ b/meta/classes-recipe/create-spdx-sdk-3.0.bbclass
@@ -8,14 +8,14 @@
8do_populate_sdk[recrdeptask] += "do_create_spdx do_create_package_spdx" 8do_populate_sdk[recrdeptask] += "do_create_spdx do_create_package_spdx"
9do_populate_sdk[cleandirs] += "${SPDXSDKWORK}" 9do_populate_sdk[cleandirs] += "${SPDXSDKWORK}"
10do_populate_sdk[postfuncs] += "sdk_create_sbom" 10do_populate_sdk[postfuncs] += "sdk_create_sbom"
11do_populate_sdk[file-checksums] += "${SPDX3_LIB_DEP_FILES}" 11do_populate_sdk[file-checksums] += "${SPDX3_DEP_FILES}"
12POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk = " sdk_host_create_spdx" 12POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk = " sdk_host_create_spdx"
13POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk = " sdk_target_create_spdx" 13POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk = " sdk_target_create_spdx"
14 14
15do_populate_sdk_ext[recrdeptask] += "do_create_spdx do_create_package_spdx" 15do_populate_sdk_ext[recrdeptask] += "do_create_spdx do_create_package_spdx"
16do_populate_sdk_ext[cleandirs] += "${SPDXSDKEXTWORK}" 16do_populate_sdk_ext[cleandirs] += "${SPDXSDKEXTWORK}"
17do_populate_sdk_ext[postfuncs] += "sdk_ext_create_sbom" 17do_populate_sdk_ext[postfuncs] += "sdk_ext_create_sbom"
18do_populate_sdk_ext[file-checksums] += "${SPDX3_LIB_DEP_FILES}" 18do_populate_sdk_ext[file-checksums] += "${SPDX3_DEP_FILES}"
19POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk-ext = " sdk_ext_host_create_spdx" 19POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk-ext = " sdk_ext_host_create_spdx"
20POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk-ext = " sdk_ext_target_create_spdx" 20POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk-ext = " sdk_ext_target_create_spdx"
21 21
diff --git a/meta/classes/create-spdx-3.0.bbclass b/meta/classes/create-spdx-3.0.bbclass
index c0a5436ad6..3a8a97eca4 100644
--- a/meta/classes/create-spdx-3.0.bbclass
+++ b/meta/classes/create-spdx-3.0.bbclass
@@ -133,7 +133,7 @@ oe.spdx30_tasks.collect_dep_objsets[vardepsexclude] = "SPDX_MULTILIB_SSTATE_ARCH
133# SPDX library code makes heavy use of classes, which bitbake cannot easily 133# SPDX library code makes heavy use of classes, which bitbake cannot easily
134# parse out dependencies. As such, the library code files that make use of 134# parse out dependencies. As such, the library code files that make use of
135# classes are explicitly added as file checksum dependencies. 135# classes are explicitly added as file checksum dependencies.
136SPDX3_LIB_DEP_FILES = "\ 136SPDX3_DEP_FILES = "\
137 ${COREBASE}/meta/lib/oe/sbom30.py:True \ 137 ${COREBASE}/meta/lib/oe/sbom30.py:True \
138 ${COREBASE}/meta/lib/oe/spdx30.py:True \ 138 ${COREBASE}/meta/lib/oe/spdx30.py:True \
139 " 139 "
@@ -159,7 +159,7 @@ addtask do_create_spdx after \
159SSTATETASKS += "do_create_spdx" 159SSTATETASKS += "do_create_spdx"
160do_create_spdx[sstate-inputdirs] = "${SPDXDEPLOY}" 160do_create_spdx[sstate-inputdirs] = "${SPDXDEPLOY}"
161do_create_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" 161do_create_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}"
162do_create_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" 162do_create_spdx[file-checksums] += "${SPDX3_DEP_FILES}"
163 163
164python do_create_spdx_setscene () { 164python do_create_spdx_setscene () {
165 sstate_setscene(d) 165 sstate_setscene(d)
@@ -183,7 +183,7 @@ addtask do_create_package_spdx after do_create_spdx before do_build do_rm_work
183SSTATETASKS += "do_create_package_spdx" 183SSTATETASKS += "do_create_package_spdx"
184do_create_package_spdx[sstate-inputdirs] = "${SPDXRUNTIMEDEPLOY}" 184do_create_package_spdx[sstate-inputdirs] = "${SPDXRUNTIMEDEPLOY}"
185do_create_package_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" 185do_create_package_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}"
186do_create_package_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" 186do_create_package_spdx[file-checksums] += "${SPDX3_DEP_FILES}"
187 187
188python do_create_package_spdx_setscene () { 188python do_create_package_spdx_setscene () {
189 sstate_setscene(d) 189 sstate_setscene(d)