From 094984833ac27c632701f763c5ee447564d63f62 Mon Sep 17 00:00:00 2001 From: Maanya Goenka Date: Thu, 2 Mar 2023 16:35:43 -0800 Subject: create-spdx: fix config build by adding dependency to enable reruns The issue encountered is about local stos builds failing (when these builds are preceded by a local SoC OS or MOS build). Essentially, the failure is seen when building two different configs with shared state, one where gcc-cross- has a dependency and one where it doesn't (specifically, one where the abicheck class in meta-binaryaudit is inherited and one where it isn't). Hence, the task signatures change but a rerun of those said tasks does not occur. The result is that when the config with the dependency is built and then the one without is built, due to incorrect dependencies, the SPDX manifest creation stage errors out. create-spdx relies on BB_TASKDEPDATA to get dependencies and then adds that variable to vardepsexclude. A change in dependencies therefore, does not result in a re-execution of the tasks. This commit adds an explicit dependency on DEPENDS which influences BB_TASKDEPDATA and triggers reruns for new config builds having different dependencies. (From OE-Core rev: 1a0dac4f45c489d107d9627d3c3ab7ccf1c60920) Signed-off-by: Maanya Goenka Signed-off-by: Paul Eggleton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes/create-spdx-2.2.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index 454dd7a7a0..13d13fe1fc 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass @@ -381,7 +381,7 @@ def collect_dep_recipes(d, doc, spdx_recipe): return dep_recipes collect_dep_recipes[vardepsexclude] += "BB_TASKDEPDATA" - +collect_dep_recipes[vardeps] += "DEPENDS" def collect_dep_sources(d, dep_recipes): import oe.sbom -- cgit v1.2.3-54-g00ecf