From 0b871c57b8c3e45fd64d10037a32033d4a347d67 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 1 Sep 2021 08:44:45 -0500 Subject: classes/create-spdx: Add runtime dependency mapping (From OE-Core rev: 82f3229bce41dc101c79865033432161dac269d8) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/lib/oe/sbom.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/sbom.py b/meta/lib/oe/sbom.py index 294feee10b..848812c0b7 100644 --- a/meta/lib/oe/sbom.py +++ b/meta/lib/oe/sbom.py @@ -28,10 +28,11 @@ def get_image_spdxid(img): return "SPDXRef-Image-%s" % img -def write_doc(d, spdx_doc, subdir): +def write_doc(d, spdx_doc, subdir, spdx_deploy=None): from pathlib import Path - spdx_deploy = Path(d.getVar("SPDXDEPLOY")) + if spdx_deploy is None: + spdx_deploy = Path(d.getVar("SPDXDEPLOY")) dest = spdx_deploy / subdir / (spdx_doc.name + ".spdx.json") dest.parent.mkdir(exist_ok=True, parents=True) -- cgit v1.2.3-54-g00ecf