diff mbox series

[2/2] sbom-cve-check: Fix empty IMAGE_LINK_NAME handling

Message ID 20260526060000.874022-2-niko.mauno@vaisala.com
State Under Review
Headers show
Series [1/2] sbom-cve-check-common: Fatalize command failure | expand

Commit Message

Niko Mauno May 26, 2026, 6 a.m. UTC 
Avoid following build breakage when IMAGE_LINK_NAME is set as empty
string:

  sbom-cve-check: error: [Errno 2] No such file or directory: '/build/layers/openembedded-core/build/tmp/deploy/images/qemuarm/.spdx.json'

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
---
 meta/classes-recipe/sbom-cve-check.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/sbom-cve-check.bbclass b/meta/classes-recipe/sbom-cve-check.bbclass
index fe145a2212..39719d51dd 100644
--- a/meta/classes-recipe/sbom-cve-check.bbclass
+++ b/meta/classes-recipe/sbom-cve-check.bbclass
@@ -14,9 +14,11 @@  python do_sbom_cve_check() {
     """
     Task: Run sbom-cve-check analysis on SBOM.
     """
-    sbom_path = d.expand("${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.spdx.json")
     image_name = d.getVar("IMAGE_NAME")
     link_name = d.getVar("IMAGE_LINK_NAME")
+    sbom_path = d.expand("${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.spdx.json") \
+                if link_name else \
+                d.expand("${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.spdx.json")
     run_sbom_cve_check(d, sbom_path, image_name, link_name)
 }