From f400ba75f2d7987abb177a43f94874a7fdc1ec0a Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Wed, 22 Oct 2025 10:06:47 +0100 Subject: [PATCH] spdx-3.0: replace SPDX3_LIB_DEP_FILES with SPDX3_DEP_FILES We can have more files types in the chain of dependencies and not just libs. Signed-off-by: Jose Quaresma Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes-recipe/create-spdx-image-3.0.bbclass | 6 +++--- meta/classes-recipe/create-spdx-sdk-3.0.bbclass | 4 ++-- meta/classes/create-spdx-3.0.bbclass | 6 +++--- 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}" do_create_rootfs_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" do_create_rootfs_spdx[recrdeptask] += "do_create_spdx do_create_package_spdx" do_create_rootfs_spdx[cleandirs] += "${SPDXROOTFSDEPLOY}" -do_create_rootfs_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" +do_create_rootfs_spdx[file-checksums] += "${SPDX3_DEP_FILES}" python do_create_rootfs_spdx_setscene() { sstate_setscene(d) @@ -54,7 +54,7 @@ do_create_image_spdx[sstate-inputdirs] = "${SPDXIMAGEWORK}" do_create_image_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" do_create_image_spdx[cleandirs] = "${SPDXIMAGEWORK}" do_create_image_spdx[dirs] = "${SPDXIMAGEWORK}" -do_create_image_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" +do_create_image_spdx[file-checksums] += "${SPDX3_DEP_FILES}" do_create_image_spdx[vardeps] += "\ SPDX_IMAGE_PURPOSE \ " @@ -77,7 +77,7 @@ do_create_image_sbom_spdx[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" do_create_image_sbom_spdx[stamp-extra-info] = "${MACHINE_ARCH}" do_create_image_sbom_spdx[cleandirs] = "${SPDXIMAGEDEPLOYDIR}" do_create_image_sbom_spdx[recrdeptask] += "do_create_spdx do_create_package_spdx" -do_create_image_sbom_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" +do_create_image_sbom_spdx[file-checksums] += "${SPDX3_DEP_FILES}" python do_create_image_sbom_spdx_setscene() { 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 @@ do_populate_sdk[recrdeptask] += "do_create_spdx do_create_package_spdx" do_populate_sdk[cleandirs] += "${SPDXSDKWORK}" do_populate_sdk[postfuncs] += "sdk_create_sbom" -do_populate_sdk[file-checksums] += "${SPDX3_LIB_DEP_FILES}" +do_populate_sdk[file-checksums] += "${SPDX3_DEP_FILES}" POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk = " sdk_host_create_spdx" POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk = " sdk_target_create_spdx" do_populate_sdk_ext[recrdeptask] += "do_create_spdx do_create_package_spdx" do_populate_sdk_ext[cleandirs] += "${SPDXSDKEXTWORK}" do_populate_sdk_ext[postfuncs] += "sdk_ext_create_sbom" -do_populate_sdk_ext[file-checksums] += "${SPDX3_LIB_DEP_FILES}" +do_populate_sdk_ext[file-checksums] += "${SPDX3_DEP_FILES}" POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk-ext = " sdk_ext_host_create_spdx" POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk-ext = " sdk_ext_target_create_spdx" 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 # SPDX library code makes heavy use of classes, which bitbake cannot easily # parse out dependencies. As such, the library code files that make use of # classes are explicitly added as file checksum dependencies. -SPDX3_LIB_DEP_FILES = "\ +SPDX3_DEP_FILES = "\ ${COREBASE}/meta/lib/oe/sbom30.py:True \ ${COREBASE}/meta/lib/oe/spdx30.py:True \ " @@ -159,7 +159,7 @@ addtask do_create_spdx after \ SSTATETASKS += "do_create_spdx" do_create_spdx[sstate-inputdirs] = "${SPDXDEPLOY}" do_create_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" -do_create_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" +do_create_spdx[file-checksums] += "${SPDX3_DEP_FILES}" python do_create_spdx_setscene () { sstate_setscene(d) @@ -183,7 +183,7 @@ addtask do_create_package_spdx after do_create_spdx before do_build do_rm_work SSTATETASKS += "do_create_package_spdx" do_create_package_spdx[sstate-inputdirs] = "${SPDXRUNTIMEDEPLOY}" do_create_package_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" -do_create_package_spdx[file-checksums] += "${SPDX3_LIB_DEP_FILES}" +do_create_package_spdx[file-checksums] += "${SPDX3_DEP_FILES}" python do_create_package_spdx_setscene () { sstate_setscene(d) -- 2.47.3