Re: [PATCH] image: allow multiple image recipes to deploy DTB_FILES

["'Jan Kiszka' via isar-users" <isar-users@googlegroups.com>]

On 05.07.24 09:18, 'Cedric Hombourger' via isar-users wrote:
> sstate is checking for overlapping files in DEPLOY_DIR and will
> raise an error when building a second image for a machine that
> uses DTB_FILES.
> 
> Reproducer:
>   bitbake mc:phyboard-mira-bookworm:isar-image-base
>   bitbake mc:phyboard-mira-bookworm:isar-image-debug
> 
> Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com>
> ---
>  meta/classes/image.bbclass | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index c29d9e26..8b316c83 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -27,7 +27,11 @@ INITRD_IMAGE ?= ""
>  INITRD_DEPLOY_FILE = "${@ d.getVar('INITRD_IMAGE') or '${IMAGE_FULLNAME}-initrd.img'}"
>  
>  # This defines the deployed dtbs for reuse by imagers
> +# Since we may be building several images with the same set of DTB_FILES, silent sstate
> +# overlap checks
>  DTB_FILES ?= ""
> +DEPLOY_DTB_FILES = "${@ ' '.join(['${DEPLOY_DIR_IMAGE}/' + os.path.basename(dtb) for dtb in d.getVar('DTB_FILES').split()]) }"
> +SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DTB_FILES}"
>  
>  # Useful variables for imager implementations:
>  PP = "/home/builder/${PN}-${MACHINE}"

There is still
https://patchwork.isar-build.org/project/isar/list/?series=1209 pending
which looks much less risky to paper over a real conflict.

Jan

-- 
Siemens AG, Technology
Linux Expert Center

-- 
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 on the web visit https://groups.google.com/d/msgid/isar-users/2f1bad7a-5e81-468b-8c75-804e7cee1a49%40siemens.com.