mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

create-spdx.bbclass: Simplify extraction of license text

Browse Source 
There is no reason to first search for all available licenses using
avail_licenses() and then search through the same paths looking for
the actual license texts. Just look for the license texts directly
instead.

(From OE-Core rev: 59eb405a80f0a0acf9b754b2b78399bacb0094ae)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
2022-03-24 00:14:57 +01:00
committed by Richard Purdie
parent 1f1fcb41b4
commit fb0a43cd2f
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
meta/classes/create-spdx.bbclass
View File

@@ -94,7 +94,6 @@ def convert_license_to_spdx(lic, document, d, existing={}):
from pathlib import Path
import oe.spdx
avail_licenses = available_licenses(d)
license_data = d.getVar("SPDX_LICENSE_DATA")
extracted = {}
@@ -112,8 +111,8 @@ def convert_license_to_spdx(lic, document, d, existing={}):
if name == "PD":
# Special-case this.
extracted_info.extractedText = "Software released to the public domain"
elif name in avail_licenses:
# This license can be found in COMMON_LICENSE_DIR or LICENSE_PATH
else:
# Seach for the license in COMMON_LICENSE_DIR and LICENSE_PATH
for directory in [d.getVar('COMMON_LICENSE_DIR')] + (d.getVar('LICENSE_PATH') or '').split():
try:
with (Path(directory) / name).open(errors="replace") as f:
@@ -122,18 +121,14 @@ def convert_license_to_spdx(lic, document, d, existing={}):
except FileNotFoundError:
pass
if extracted_info.extractedText is None:
# Error out, as the license was in avail_licenses so should
# be on disk somewhere.
bb.error("Cannot find text for license %s" % name)
else:
# If it's not SPDX, or PD, or in avail_licenses, then NO_GENERIC_LICENSE must be set
filename = d.getVarFlag('NO_GENERIC_LICENSE', name)
if filename:
filename = d.expand("${S}/" + filename)
with open(filename, errors="replace") as f:
extracted_info.extractedText = f.read()
else:
bb.error("Cannot find any text for license %s" % name)
# 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)
with open(filename, errors="replace") as f:
extracted_info.extractedText = f.read()
else:
bb.error("Cannot find any text for license %s" % name)
extracted[name] = extracted_info
document.hasExtractedLicensingInfos.append(extracted_info)