Couple of SPDX fixes
cover Couple of SPDX fixes
I was trying to build more layers such as meta-clang and found additional changes are needed to support other packages that are installed into work-shared.
We might also need a similar patch for the archiver is this change is acceptable.
Sau!
Saul Wold (2):
create_spdx: ensure is_work_shared() is uniqe
create-spdx: Protect against None from LICENSE_PATH
meta/classes/create-spdx.bbclass | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 create_spdx: ensure is_work_shared() is uniqe
There is a function with the same name is_work_shared() in the archiver class this causes a conflict when both classes are included. Use work-shared as the check in WORKDIR to allow for other packages beyond the kernel and gcc that use a common shared-work source directory.
--- meta/classes/create-spdx.bbclass | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
meta/classes/create-spdx.bbclass +5 -7
@@ -53,10 +53,8 @@ def recipe_spdx_is_native(d, recipe): a.annotator == "Tool: %s - %s" % (d.getVar("SPDX_TOOL_NAME"), d.getVar("SPDX_TOOL_VERSION")) and a.comment == "isNative" for a in recipe.annotations) -def is_work_shared(d): - pn = d.getVar('PN') - return bb.data.inherits_class('kernel', d) or pn.startswith('gcc-source') - +def is_work_shared_spdx(d): + return bb.data.inherits_class('kernel', d) or ('work-shared' in d.getVar('WORKDIR')) python() { import json
@@ -747,7 +745,7 @@ def spdx_get_src(d): try: # The kernel class functions require it to be on work-shared, so we dont change WORKDIR - if not is_work_shared(d): + if not is_work_shared_spdx(d): # Change the WORKDIR to make do_unpack do_patch run in another dir. d.setVar('WORKDIR', spdx_workdir) # Restore the original path to recipe's native sysroot (it's relative to WORKDIR).
@@ -760,7 +758,7 @@ def spdx_get_src(d): bb.build.exec_func('do_unpack', d) # Copy source of kernel to spdx_workdir - if is_work_shared(d): + if is_work_shared_spdx(d): d.setVar('WORKDIR', spdx_workdir) d.setVar('STAGING_DIR_NATIVE', spdx_sysroot_native) src_dir = spdx_workdir + "/" + d.getVar('PN')+ "-" + d.getVar('PV') + "-" + d.getVar('PR')
@@ -776,7 +774,7 @@ def spdx_get_src(d): shutils.rmtree(git_path) # Make sure gcc and kernel sources are patched only once - if not (d.getVar('SRC_URI') == "" or is_work_shared(d)): + if not (d.getVar('SRC_URI') == "" or is_work_shared_spdx(d)): bb.build.exec_func('do_patch', d) # Some userland has no source.
Signature · 1 line
2.31.1
PATCH 2/2 create-spdx: Protect against None from LICENSE_PATH
In reply to Saul WoldIf LICENSE_PATH is not set, then the split() will fail on a NoneType.
--- meta/classes/create-spdx.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/classes/create-spdx.bbclass +1 -2
@@ -92,7 +92,7 @@ def convert_license_to_spdx(lic, document, d, existing={}): extracted_info.extractedText = "Software released to the public domain" elif name in available_licenses: # This license can be found in COMMON_LICENSE_DIR or LICENSE_PATH - for directory in [d.getVar('COMMON_LICENSE_DIR')] + d.getVar('LICENSE_PATH').split(): + for directory in [d.getVar('COMMON_LICENSE_DIR')] + (d.getVar('LICENSE_PATH') or '').split(): try: with (Path(directory) / name).open(errors="replace") as f: extracted_info.extractedText = f.read()
@@ -145,7 +145,6 @@ def convert_license_to_spdx(lic, document, d, existing={}): return ' '.join(convert(l) for l in lic_split) - def process_sources(d): pn = d.getVar('PN') assume_provided = (d.getVar("ASSUME_PROVIDED") or "").split()
Signature · 1 line
2.31.1