@@ -526,16 +526,24 @@ def get_cargo_scopes(d):
def add_dependency_scopes(d, objset, build, source_files):
- """Give crate downloads a lifecycle scope, see get_cargo_scopes()."""
+ """Give crate downloads a lifecycle scope, see get_cargo_scopes().
+
+ Returns the crate downloads that are not built into the target: crates
+ that are not used on it, build scripts, proc-macros and the crates
+ they use, and test-only crates.
+ """
scopes = get_cargo_scopes(d)
if scopes is None:
- return
+ return set()
by_scope = {}
+ not_in_target = set()
for dl in source_files:
if not (getattr(dl, "software_packageUrl", None) or "").startswith("pkg:cargo/"):
continue
scope = scopes.get((dl.name, dl.software_packageVersion))
+ if scope != "runtime":
+ not_in_target.add(dl)
if scope:
by_scope.setdefault(scope, []).append(dl)
else:
@@ -554,6 +562,8 @@ def add_dependency_scopes(d, objset, build, source_files):
sorted(oe.sbom30.get_element_link_id(dl) for dl in dls),
)
+ return not_in_target
+
def add_download_files(d, objset):
inputs = set()
@@ -1057,8 +1067,20 @@ def create_spdx(d):
source_files = add_download_files(d, build_objset)
build_inputs |= source_files
+
+ # The output packages inherit the PURLs of the downloads they are built
+ # from, as the code of statically linked dependencies is in them. Only
+ # the downloads known not to be built into the target are left out.
+ not_in_target = set()
if bb.data.inherits_class("cargo", d):
- add_dependency_scopes(d, build_objset, build, source_files)
+ not_in_target = add_dependency_scopes(d, build_objset, build, source_files)
+ dependency_purls = sorted(
+ {
+ dl.software_packageUrl
+ for dl in source_files
+ if getattr(dl, "software_packageUrl", None) and dl not in not_in_target
+ }
+ )
recipe_spdx_license = add_license_expression(
d, build_objset, d.getVar("LICENSE"), license_data, [recipe_objset]
@@ -1171,7 +1193,7 @@ def create_spdx(d):
d.getVar("SPDX_PACKAGE_URLS:%s" % package)
or d.getVar("SPDX_PACKAGE_URLS")
or ""
- ).split()
+ ).split() + dependency_purls
set_purls(spdx_package, purls)