create-spdx: default share_src for shared sources
PATCH 1/1 create-spdx: default share_src for shared sources
From: Konrad Weihmann <[email protected]>
if a source is using work-shared but isn't a kernel, like for instance llvm-source from meta-clang, share_src was previously undefined leading to a crash of the python code. Default to WORKDIR and just override it in case the source being a kernel recipe.
Additionally changes the variable names in the following, as they imply that it's only about the kernel, which is not the case in every case
Signed-off-by Konrad Weihmann <[email protected]>
On-behalf-of: Avnet Embedded <[email protected]>
Signed-off-by Joshua Watt <[email protected]>
Reviewed-by Joshua Watt <[email protected]>
---
NOTE: This patch must be applied *after* the patch to rename create-spdx.bbclass -> create-spdx-2.2.bbclass
meta/classes/create-spdx-2.2.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta/classes/create-spdx-2.2.bbclass +3 -2
@@ -795,6 +795,7 @@ def spdx_get_src(d): bb.build.exec_func('do_unpack', d) # Copy source of kernel to spdx_workdir if is_work_shared_spdx(d): + share_src = d.getVar('WORKDIR') 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')
@@ -802,8 +803,8 @@ def spdx_get_src(d): if bb.data.inherits_class('kernel',d): share_src = d.getVar('STAGING_KERNEL_DIR') cmd_copy_share = "cp -rf " + share_src + "/* " + src_dir + "/" - cmd_copy_kernel_result = os.popen(cmd_copy_share).read() - bb.note("cmd_copy_kernel_result = " + cmd_copy_kernel_result) + cmd_copy_shared_res = os.popen(cmd_copy_share).read() + bb.note("cmd_copy_shared_result = " + cmd_copy_shared_res) git_path = src_dir + "/.git" if os.path.exists(git_path):
Signature · 1 line
2.33.0