Skip to contentSkip to conversation

classes/create-spdx-2.2: allow absolute paths in NO_GENERIC_LICENSE

PATCH New Max Krummenacher 1 participant 1 message Aug 9, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 classes/create-spdx-2.2: allow absolute paths in NO_GENERIC_LICENSE

From: Max Krummenacher <[email protected]>

The current implementation expects the license file in NO_GENERIC_LICENSE specified as being relative to ${S}.
Assuming that there are two source locations this gets confusing to specify, e.g. ${WORKDIR}/other_tree/file looks more natural than ${S}/../other_tree/file.

Check if the filename specified is not absolute and only then assume it is relative to ${S}.

---
 meta/classes/create-spdx-2.2.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes/create-spdx-2.2.bbclass +2 -1
index 844b674f6f..42d4ef54b0 100644
@@ -134,7 +134,8 @@ def convert_license_to_spdx(lic, document, d, existing={}):
                 # If it's not SPDX or PD, then NO_GENERIC_LICENSE must be set
                 filename = d.getVarFlag('NO_GENERIC_LICENSE', name)
                 if filename:
-                    filename = d.expand("${S}/" + filename)
+                    if not Path(filename).is_absolute():
+                        filename = d.expand("${S}/" + filename)
                     with open(filename, errors="replace") as f:
                         extracted_info.extractedText = f.read()
                 else:
Signature · 1 line
2.35.3