From 38a5dd136b3a3713e63d23598011efe1c4b0f459 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Tue, 3 Dec 2024 15:37:08 -0700 Subject: [PATCH] classes: create-spdx: Fix variable dependencies A few variable dependencies were incorrect from the SPDX tasks, which prevented rebuilds from occurring, or caused them to occur when they should not. Signed-off-by: Joshua Watt Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/classes-recipe/create-spdx-image-3.0.bbclass | 3 +++ meta/classes/create-spdx-3.0.bbclass | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/create-spdx-image-3.0.bbclass b/meta/classes-recipe/create-spdx-image-3.0.bbclass index 51446162857..e0f1766bb76 100644 --- a/meta/classes-recipe/create-spdx-image-3.0.bbclass +++ b/meta/classes-recipe/create-spdx-image-3.0.bbclass @@ -55,6 +55,9 @@ 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[vardeps] += "\ + SPDX_IMAGE_PURPOSE \ + " python do_create_image_spdx_setscene() { sstate_setscene(d) diff --git a/meta/classes/create-spdx-3.0.bbclass b/meta/classes/create-spdx-3.0.bbclass index 640f5490bda..25f3aa5f433 100644 --- a/meta/classes/create-spdx-3.0.bbclass +++ b/meta/classes/create-spdx-3.0.bbclass @@ -134,7 +134,15 @@ python do_create_spdx() { import oe.spdx30_tasks oe.spdx30_tasks.create_spdx(d) } -do_create_spdx[vardepsexclude] += "BB_NUMBER_THREADS" +do_create_spdx[vardepsexclude] += "BB_NUMBER_THREADS SPDX_BUILD_HOST" +do_create_spdx[vardeps] += "\ + SPDX_INCLUDE_BITBAKE_PARENT_BUILD \ + SPDX_PACKAGE_ADDITIONAL_PURPOSE \ + SPDX_PROFILES \ + SPDX_NAMESPACE_PREFIX \ + SPDX_UUID_NAMESPACE \ + " + addtask do_create_spdx after \ do_collect_spdx_deps \ do_deploy_source_date_epoch \ -- 2.47.3