summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2022-06-13 21:30:47 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-06 17:33:23 +0000
commit99483cff5c358d847ceb077349321eb57d5143e4 (patch)
tree8d67d4af1694f49acc84a0e2c9d01bfa074de4cc /meta/lib
parent4f3a35407172d79e4dec4f8ba703b1d102347fe3 (diff)
downloadpoky-99483cff5c358d847ceb077349321eb57d5143e4.tar.gz
classes/create-spdx: Add SPDX_PRETTY option
Adds an option to make the SPDX more human-readable (at the expense of a larger files) (From OE-Core rev: e680a7402edec2803b03c56590c9d08d07497c73) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 4799594b26f77ed259dc661bf077519b338390c8) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/sbom.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/sbom.py b/meta/lib/oe/sbom.py
index 3372f13a9d..52bf51440e 100644
--- a/meta/lib/oe/sbom.py
+++ b/meta/lib/oe/sbom.py
@@ -32,7 +32,7 @@ def get_sdk_spdxid(sdk):
32 return "SPDXRef-SDK-%s" % sdk 32 return "SPDXRef-SDK-%s" % sdk
33 33
34 34
35def write_doc(d, spdx_doc, subdir, spdx_deploy=None): 35def write_doc(d, spdx_doc, subdir, spdx_deploy=None, indent=None):
36 from pathlib import Path 36 from pathlib import Path
37 37
38 if spdx_deploy is None: 38 if spdx_deploy is None:
@@ -41,7 +41,7 @@ def write_doc(d, spdx_doc, subdir, spdx_deploy=None):
41 dest = spdx_deploy / subdir / (spdx_doc.name + ".spdx.json") 41 dest = spdx_deploy / subdir / (spdx_doc.name + ".spdx.json")
42 dest.parent.mkdir(exist_ok=True, parents=True) 42 dest.parent.mkdir(exist_ok=True, parents=True)
43 with dest.open("wb") as f: 43 with dest.open("wb") as f:
44 doc_sha1 = spdx_doc.to_json(f, sort_keys=True) 44 doc_sha1 = spdx_doc.to_json(f, sort_keys=True, indent=indent)
45 45
46 l = spdx_deploy / "by-namespace" / spdx_doc.documentNamespace.replace("/", "_") 46 l = spdx_deploy / "by-namespace" / spdx_doc.documentNamespace.replace("/", "_")
47 l.parent.mkdir(exist_ok=True, parents=True) 47 l.parent.mkdir(exist_ok=True, parents=True)