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

["'Cedric Hombourger' via isar-users" <isar-users@googlegroups.com>]

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}"
-- 
2.39.2

-- 
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/20240705071856.904-1-cedric.hombourger%40siemens.com.