[scarthgap] create-spdx-image-3.0: correct SSTATE_SKIP_CREATION key for do_create_image_sbom_spdx

From: Eric Meyers <eric.meyers15310@gmail.com>

The override was "task-create-image-sbom" but BitBake derives it as
"task-create-image-sbom-spdx" (do_ stripped, underscores to hyphens), so
the skip was never applied. The task then cached an ${IMAGE_NAME}-stamped
SBOM in sstate, letting a stale spdx.json be restored via setscene. A
later do_sbom_cve_check would compute the current IMAGE_NAME and fail with
"No such file or directory" on the missing timestamped SBOM. Correct the
key so the image SBOM is always regenerated, never restored from sstate.

(cherry picked from commit 45302ff5cfaf91ece74d4065acf710507f27da15)

Signed-off-by: Benjamin Robin (Schneider Electric) <benjamin.robin@bootlin.com>
---
Backport this fix to scarthgap.
---
 meta/classes-recipe/create-spdx-image-3.0.bbclass | 2 +-
 meta/classes-recipe/nospdx.bbclass                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


---
base-commit: 2814f0962f56c8d1afa4de76d2895ba9b5cb767d
change-id: 20260708-fix-sstate-create-spdx-image-scarthgap-697f60f4ab87

Best regards,
--  
Benjamin Robin (Schneider Electric) <benjamin.robin@bootlin.com>

On Wed Jul 8, 2026 at 9:11 AM CEST, Benjamin Robin via lists.openembedded.org wrote:
> From: Eric Meyers <eric.meyers15310@gmail.com>
>
> The override was "task-create-image-sbom" but BitBake derives it as
> "task-create-image-sbom-spdx" (do_ stripped, underscores to hyphens), so
> the skip was never applied. The task then cached an ${IMAGE_NAME}-stamped
> SBOM in sstate, letting a stale spdx.json be restored via setscene. A
> later do_sbom_cve_check would compute the current IMAGE_NAME and fail with
> "No such file or directory" on the missing timestamped SBOM. Correct the
> key so the image SBOM is always regenerated, never restored from sstate.
>
> (cherry picked from commit 45302ff5cfaf91ece74d4065acf710507f27da15)
>
> Signed-off-by: Benjamin Robin (Schneider Electric) <benjamin.robin@bootlin.com>

Beware, you removed the trailers (SoB: ...)  while cherry-picking.
I restored them.

Regards,

> ---
> Backport this fix to scarthgap.
> ---
>  meta/classes-recipe/create-spdx-image-3.0.bbclass | 2 +-
>  meta/classes-recipe/nospdx.bbclass                | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes-recipe/create-spdx-image-3.0.bbclass b/meta/classes-recipe/create-spdx-image-3.0.bbclass
> index e0f1766bb766..c516e9545653 100644
> --- a/meta/classes-recipe/create-spdx-image-3.0.bbclass
> +++ b/meta/classes-recipe/create-spdx-image-3.0.bbclass
> @@ -71,7 +71,7 @@ python do_create_image_sbom_spdx() {
>  }
>  addtask do_create_image_sbom_spdx after do_create_rootfs_spdx do_create_image_spdx before do_build
>  SSTATETASKS += "do_create_image_sbom_spdx"
> -SSTATE_SKIP_CREATION:task-create-image-sbom = "1"
> +SSTATE_SKIP_CREATION:task-create-image-sbom-spdx = "1"
>  do_create_image_sbom_spdx[sstate-inputdirs] = "${SPDXIMAGEDEPLOYDIR}"
>  do_create_image_sbom_spdx[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
>  do_create_image_sbom_spdx[stamp-extra-info] = "${MACHINE_ARCH}"
> diff --git a/meta/classes-recipe/nospdx.bbclass b/meta/classes-recipe/nospdx.bbclass
> index b20e28218be9..913b213a6543 100644
> --- a/meta/classes-recipe/nospdx.bbclass
> +++ b/meta/classes-recipe/nospdx.bbclass
> @@ -10,4 +10,4 @@ deltask do_create_spdx_runtime
>  deltask do_create_package_spdx
>  deltask do_create_rootfs_spdx
>  deltask do_create_image_spdx
> -deltask do_create_image_sbom
> +deltask do_create_image_sbom_spdx
>
> ---
> base-commit: 2814f0962f56c8d1afa4de76d2895ba9b5cb767d
> change-id: 20260708-fix-sstate-create-spdx-image-scarthgap-697f60f4ab87
>
> Best regards,
> --  
> Benjamin Robin (Schneider Electric) <benjamin.robin@bootlin.com>