From a94674c5bc380580d9219d2bc470c408c1779de6 Mon Sep 17 00:00:00 2001 From: "Wurm, Stephan" Date: Fri, 21 Jul 2023 08:44:05 +0000 Subject: dm-verity-image-initramfs: Allow compressed image types Using in the depends variable does not work for compressed image types like squashfs-zst, as the resulting task dependency still contains the incompatible dash. Replacing the dash by an underscore resolves this issue. Signed-off-by: Stephan Wurm Signed-off-by: Armin Kuster --- recipes-core/images/dm-verity-image-initramfs.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes-core/images/dm-verity-image-initramfs.bb b/recipes-core/images/dm-verity-image-initramfs.bb index 187aeae..78f7b49 100644 --- a/recipes-core/images/dm-verity-image-initramfs.bb +++ b/recipes-core/images/dm-verity-image-initramfs.bb @@ -19,7 +19,14 @@ IMAGE_FEATURES = "" IMAGE_LINGUAS = "" # Can we somehow inspect reverse dependencies to avoid these variables? -do_image[depends] += "${DM_VERITY_IMAGE}:do_image_${DM_VERITY_IMAGE_TYPE}" +python __anonymous() { + verity_image = d.getVar('DM_VERITY_IMAGE') + verity_type = d.getVar('DM_VERITY_IMAGE_TYPE') + + if verity_image and verity_type: + dep = ' %s:do_image_%s' % (verity_image, verity_type.replace('-', '_')) + d.appendVarFlag('do_image', 'depends', dep) +} # Ensure dm-verity.env is updated also when rebuilding DM_VERITY_IMAGE do_image[nostamp] = "1" -- cgit v1.2.3-54-g00ecf