From: Jayasurya Maganuru Date: Mon, 15 Dec 2025 15:11:06 +0000 (-0800) Subject: create-spdx-image-3.0: Image SPDX/SBOM tasks are retained for eSDK installation X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a36797cfa716a20414ceab56c962a625dd4b514;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git create-spdx-image-3.0: Image SPDX/SBOM tasks are retained for eSDK installation Fixes [YOCTO #15853] Image SPDX/SBOM tasks were running after do_sdk_depends, causing their signatures to be excluded from locked-sigs.inc. As a result, the eSDK installer attempted to re-run these tasks, leading to unexpected task execution errors. Run do_create_image_sbom_spdx before do_sdk_depends to ensure all image SPDX/SBOM tasks are completed and captured in the locked signatures. Signed-off-by: Jayasurya Maganuru Suggested-by: Joshua Watt Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/classes-recipe/create-spdx-image-3.0.bbclass b/meta/classes-recipe/create-spdx-image-3.0.bbclass index 636ab14eb0..f070b7e697 100644 --- a/meta/classes-recipe/create-spdx-image-3.0.bbclass +++ b/meta/classes-recipe/create-spdx-image-3.0.bbclass @@ -69,7 +69,7 @@ python do_create_image_sbom_spdx() { import oe.spdx30_tasks oe.spdx30_tasks.create_image_sbom_spdx(d) } -addtask do_create_image_sbom_spdx after do_create_rootfs_spdx do_create_image_spdx before do_build +addtask do_create_image_sbom_spdx after do_create_rootfs_spdx do_create_image_spdx before do_build do_sdk_depends SSTATETASKS += "do_create_image_sbom_spdx" SSTATE_SKIP_CREATION:task-create-image-sbom = "1" do_create_image_sbom_spdx[sstate-inputdirs] = "${SPDXIMAGEDEPLOYDIR}"