summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMaanya Goenka <maanyagoenka@linux.microsoft.com>2023-03-02 16:35:43 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-06 09:52:16 +0000
commit094984833ac27c632701f763c5ee447564d63f62 (patch)
tree6c441a24b10b68675d7f5ee1cbc993fcd17dc1d6 /meta/classes
parentd24ae96060c83604c1eb5a4a2ca3503f827e9bfb (diff)
downloadpoky-094984833ac27c632701f763c5ee447564d63f62.tar.gz
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-<arch> 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 <maanyagoenka@microsoft.com> Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/create-spdx-2.2.bbclass2
1 files changed, 1 insertions, 1 deletions
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):
381 return dep_recipes 381 return dep_recipes
382 382
383collect_dep_recipes[vardepsexclude] += "BB_TASKDEPDATA" 383collect_dep_recipes[vardepsexclude] += "BB_TASKDEPDATA"
384 384collect_dep_recipes[vardeps] += "DEPENDS"
385 385
386def collect_dep_sources(d, dep_recipes): 386def collect_dep_sources(d, dep_recipes):
387 import oe.sbom 387 import oe.sbom