mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/create-spdx: handle if IMAGE_LINK_NAME is empty

Browse Source 
If IMAGE_LINK_NAME is set to "" (supported in other classes) then skip
creating symlinks for the spdx manifest files.

(From OE-Core rev: c2d5e2dbbba78d8d7036f6418360b2e84bcdc169)

Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2022-01-09 17:54:49 -08:00
committed by Richard Purdie
parent 42e73db4c9
commit 0071d909a5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -870,8 +870,9 @@ python image_combine_spdx() {
with image_spdx_path.open("wb") as f:
doc.to_json(f, sort_keys=True)
image_spdx_link = imgdeploydir / (image_link_name + ".spdx.json")
image_spdx_link.symlink_to(os.path.relpath(image_spdx_path, image_spdx_link.parent))
if image_link_name:
image_spdx_link = imgdeploydir / (image_link_name + ".spdx.json")
image_spdx_link.symlink_to(os.path.relpath(image_spdx_path, image_spdx_link.parent))
num_threads = int(d.getVar("BB_NUMBER_THREADS"))
@@ -942,8 +943,9 @@ python image_combine_spdx() {
tar.addfile(info, fileobj=index_str)
def make_image_link(target_path, suffix):
link = imgdeploydir / (image_link_name + suffix)
link.symlink_to(os.path.relpath(target_path, link.parent))
if image_link_name:
link = imgdeploydir / (image_link_name + suffix)
link.symlink_to(os.path.relpath(target_path, link.parent))
make_image_link(spdx_tar_path, ".spdx.tar.zst")