diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2021-09-01 08:44:43 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-03 09:53:28 +0100 |
commit | f1cd4f264d206a3bf9d95cc1e632a476299643e3 (patch) | |
tree | 42ce8da6ef81628e98139076c84aa000a60ff3bc /meta/classes/create-spdx.bbclass | |
parent | f3796b452490804fa57e66937d912072b1729e8a (diff) | |
download | poky-f1cd4f264d206a3bf9d95cc1e632a476299643e3.tar.gz |
classes/create-spdx: Add SHA1 to index file
(From OE-Core rev: ebfe78ad26b643ce0fb22ba5b3ede43da4a78987)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/create-spdx.bbclass')
-rw-r--r-- | meta/classes/create-spdx.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index e49d4d7e3c..5adad59065 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass | |||
@@ -627,7 +627,7 @@ python image_combine_spdx() { | |||
627 | visited_docs.add(path) | 627 | visited_docs.add(path) |
628 | 628 | ||
629 | with path.open("rb") as f: | 629 | with path.open("rb") as f: |
630 | doc = oe.spdx.SPDXDocument.from_json(f) | 630 | doc, sha1 = oe.sbom.read_doc(f) |
631 | f.seek(0) | 631 | f.seek(0) |
632 | 632 | ||
633 | if doc.documentNamespace in visited_docs: | 633 | if doc.documentNamespace in visited_docs: |
@@ -651,6 +651,7 @@ python image_combine_spdx() { | |||
651 | index["documents"].append({ | 651 | index["documents"].append({ |
652 | "filename": info.name, | 652 | "filename": info.name, |
653 | "documentNamespace": doc.documentNamespace, | 653 | "documentNamespace": doc.documentNamespace, |
654 | "sha1": sha1, | ||
654 | }) | 655 | }) |
655 | 656 | ||
656 | for ref in doc.externalDocumentRefs: | 657 | for ref in doc.externalDocumentRefs: |