mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 09:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/create-spdx-2.2: Fix runtime dependency calculations

Browse Source 
Fixes the runtime dependency calculations to also only follow direct
dependencies of the current task instead of all transient dependencies
in a similar way as the build time dependencies.

(From OE-Core rev: 5fa00564b047725541a5fed95b621f0202803345)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2023-06-01 20:02:26 -05:00
committed by Richard Purdie
parent 15acbd1090
commit 819596507c
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/classes/create-spdx-2.2.bbclass
View File

@@ -454,7 +454,7 @@ def add_download_packages(d, doc, recipe):
# but this should be sufficient for now
doc.add_relationship(package, "BUILD_DEPENDENCY_OF", recipe)
def collect_deps(d, dep_task):
def collect_direct_deps(d, dep_task):
current_task = "do_" + d.getVar("BB_CURRENTTASK")
pn = d.getVar("PN")
@@ -474,8 +474,8 @@ def collect_deps(d, dep_task):
return sorted(deps)
collect_deps[vardepsexclude] += "BB_TASKDEPDATA"
collect_deps[vardeps] += "DEPENDS"
collect_direct_deps[vardepsexclude] += "BB_TASKDEPDATA"
collect_direct_deps[vardeps] += "DEPENDS"
python do_collect_spdx_deps() {
# This task calculates the build time dependencies of the recipe, and is
@@ -489,7 +489,7 @@ python do_collect_spdx_deps() {
spdx_deps_file = Path(d.getVar("SPDXDEPS"))
deps = collect_deps(d, "do_create_spdx")
deps = collect_direct_deps(d, "do_create_spdx")
with spdx_deps_file.open("w") as f:
json.dump(deps, f)
@@ -710,10 +710,7 @@ def collect_package_providers(d):
providers = {}
taskdepdata = d.getVar("BB_TASKDEPDATA", False)
deps = sorted(set(
(dep[0], dep[7]) for dep in taskdepdata.values() if dep[0] != d.getVar("PN")
))
deps = collect_direct_deps(d, "do_create_spdx")
deps.append((d.getVar("PN"), d.getVar("BB_HASHFILENAME")))
for dep_pn, dep_hashfn in deps: