If a debug source cannot be found, mark it as NOASSERTION so that other
tools at least know we were unable to locate it.
Signed-off-by: Joshua Watt <jpewhac...@gmail.com>
---
meta/classes/create-spdx.bbclass | 36 ++++++++++++++------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass
index 28a2e64f52..3f635045a6 100644
--- a/meta/classes/create-spdx.bbclass
+++ b/meta/classes/create-spdx.bbclass
@@ -190,6 +190,7 @@ def add_package_sources_from_debug(d, package_doc,
spdx_package, package, packag
continue
for debugsrc in file_data["debugsrc"]:
+ ref_id = "NOASSERTION"
for search in debug_search_paths:
debugsrc_path = search / debugsrc.lstrip("/")
if not debugsrc_path.exists():
@@ -205,31 +206,26 @@ def add_package_sources_from_debug(d, package_doc,
spdx_package, package, packag
file_sha256 = sha.hexdigest()
- if not file_sha256 in sources:
- bb.debug(1, "Debug source %s with SHA256 %s not found in
any dependency" % (str(debugsrc_path), file_sha256))
- continue
+ if file_sha256 in sources:
+ source_file = sources[file_sha256]
+
+ doc_ref =
package_doc.find_external_document_ref(source_file.doc.documentNamespace)
+ if doc_ref is None:
+ doc_ref = oe.spdx.SPDXExternalDocumentRef()
+ doc_ref.externalDocumentId = "DocumentRef-dependency-"
+ source_file.doc.name
+ doc_ref.spdxDocument =
source_file.doc.documentNamespace
+ doc_ref.checksum.algorithm = "SHA1"
+ doc_ref.checksum.checksumValue = source_file.doc_sha1
+ package_doc.externalDocumentRefs.append(doc_ref)
- source_file = sources[file_sha256]
-
- doc_ref =
package_doc.find_external_document_ref(source_file.doc.documentNamespace)
- if doc_ref is None:
- doc_ref = oe.spdx.SPDXExternalDocumentRef()
- doc_ref.externalDocumentId = "DocumentRef-dependency-" +
source_file.doc.name
- doc_ref.spdxDocument = source_file.doc.documentNamespace
- doc_ref.checksum.algorithm = "SHA1"
- doc_ref.checksum.checksumValue = source_file.doc_sha1
- package_doc.externalDocumentRefs.append(doc_ref)
-
- package_doc.add_relationship(
- pkg_file,
- "GENERATED_FROM",
- "%s:%s" % (doc_ref.externalDocumentId,
source_file.file.SPDXID),
- comment=debugsrc
- )
+ ref_id = "%s:%s" % (doc_ref.externalDocumentId,
source_file.file.SPDXID),
+ else:
+ bb.debug(1, "Debug source %s with SHA256 %s not found in
any dependency" % (str(debugsrc_path), file_sha256))
break
else:
bb.debug(1, "Debug source %s not found" % debugsrc)
+ package_doc.add_relationship(pkg_file, "GENERATED_FROM", ref_id,
comment=debugsrc)
def collect_dep_recipes(d, doc, spdx_recipe):
from pathlib import Path
--
2.32.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155568):
https://lists.openembedded.org/g/openembedded-core/message/155568
Mute This Topic: https://lists.openembedded.org/mt/85302497/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
