From 374dc08c0f22e98a267676f71308592d17f77d64 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 1 Sep 2021 08:44:44 -0500 Subject: classes/create-spdx: Add index to DEPLOYDIR Add the index to DEPLOYDIR in addition to adding it to the SPDX archive Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/create-spdx.bbclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index 5adad59065..14caae8a50 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -674,7 +674,16 @@ python image_combine_spdx() { tar.addfile(info, fileobj=index_str) - spdx_tar_link = imgdeploydir / (image_link_name + ".spdx.tar.zst") - spdx_tar_link.symlink_to(os.path.relpath(spdx_tar_path, spdx_tar_link.parent)) + def make_image_link(target_path, suffix): + 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") + + spdx_index_path = imgdeploydir / (image_name + ".spdx.index.json") + with spdx_index_path.open("w") as f: + json.dump(index, f, sort_keys=True) + + make_image_link(spdx_index_path, ".spdx.index.json") } -- cgit 1.2.3-korg