Re: [PATCH 2/2] merge_wic_sbom: fix name of initrd sbom file when merging

["'Moessbauer, Felix (FT RPD CED OES-DE)' via isar-users" <isar-users@googlegroups.com>]

On Fri, 2026-03-20 at 17:53 +0100, Felix Moessbauer wrote:
> In merge_wic_sbom the rootfs, initrd and imager SBOM ar merged. However,
> the initrd one was never included, as it was accessed by an incorrect
> name.
> 
> As there is no common ancestor of the initramfs and image recipe, the name
> of the initrd that is generated is only coincidally coupled with the one
> that is imaged. By that, we need to derive the INITRAMFS_FULLNAME variable
> (set in initramfs.bbclass) from the INITRD_DEPLOY_FILE variable which
> points to the initrd that is imaged.
> 
> Fixes: 174dd3e4 ("wic: create uniform SBOM describing all image ...")
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/classes-recipe/imagetypes_wic.bbclass | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes-recipe/imagetypes_wic.bbclass b/meta/classes-recipe/imagetypes_wic.bbclass
> index 5adea149..231fecde 100644
> --- a/meta/classes-recipe/imagetypes_wic.bbclass
> +++ b/meta/classes-recipe/imagetypes_wic.bbclass
> @@ -212,10 +212,15 @@ EOIMAGER
>  merge_wic_sbom() {
>      BOMTYPE="$1"
>      TIMESTAMP=$(date --iso-8601=s -d @${SOURCE_DATE_EPOCH})
> +    # As there is no common ancestor of the initramfs and image recipe, the name of the
> +    # initrd that is generated is only coincidally coupled with the one that is imaged.
> +    # By that, we need to derive the INITRAMFS_FULLNAME variable (set in initramfs.bbclass)
> +    # from the INITRD_DEPLOY_FILE variable which points to the initrd that is imaged.
> +    INITRAMFS_FULLNAME="${@ d.getVar('INITRD_DEPLOY_FILE').removesuffix('-initrd.img') }"

This unfortunately breaks when not using a custom initrd and debsbom
0.7.1 (as in this case the rootfs sbom is supplied twice).

Will send a fix.

Felix

>      sbom_document_uuid="${@d.getVar('SBOM_DOCUMENT_UUID') or generate_document_uuid(d, False)}"
>  
>      cat ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.$BOMTYPE.json \
> -        ${DEPLOY_DIR_IMAGE}/${INITRD_DEPLOY_FILE}.$BOMTYPE.json \
> +        ${DEPLOY_DIR_IMAGE}/$INITRAMFS_FULLNAME.$BOMTYPE.json \
>          ${WORKDIR}/imager.$BOMTYPE.json 2>/dev/null | \
>      bwrap \
>          --unshare-user \
> -- 
> 2.53.0

-- 
Siemens AG
Linux Expert Center
Friedrich-Ludwig-Bauer-Str. 3
85748 Garching, Germany

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/f7583dba149ba6fc605a010a43e8f621772c4ea1.camel%40siemens.com.