diff mbox series

[v2] Fix initrd build depends after setting IMAGE_INITRD

Message ID 20251204084359.3321775-1-Quirin.Gylstorff@siemens.com
State Under Review
Headers show
Series [v2] Fix initrd build depends after setting IMAGE_INITRD | expand

Commit Message

Quirin Gylstorff Dec. 4, 2025, 8:43 a.m. UTC 
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

As do_image is virtual task it is not executed, see log.taskorder.

20251203-141015.078894 do_fetch (8603): log.do_fetch.8603
20251203-141015.432653 do_unpack (8817): log.do_unpack.8817
20251203-141016.385643 do_copy_wks_template (9626): log.do_copy_wks_template.9626
20251203-141018.352672 do_check_swu_partition_uuids (11629): log.do_check_swu_partition_uuids.11629
20251203-142714.202649 do_rootfs_install (269893): log.do_rootfs_install.269893
20251203-142812.346458 do_copy_boot_files (278687): log.do_copy_boot_files.278687
20251203-142812.347572 do_deploy_tpm2_firmware (278688): log.do_deploy_tpm2_firmware.278688
20251203-142812.479116 do_rootfs_postprocess (278755): log.do_rootfs_postprocess.278755
20251203-142813.723336 do_generate_image_uuid (280155): log.do_generate_image_uuid.280155
20251203-142813.833043 do_rootfs_finalize (280281): log.do_rootfs_finalize.280281
20251203-142813.837689 do_transform_template (280287): log.do_transform_template.280287
20251203-142835.289802 do_rootfs_quality_check (303158): log.do_rootfs_quality_check.303158
20251203-142835.458624 do_rootfs (303179): log.do_rootfs.303179
20251203-142835.545966 do_image_tools (303194): log.do_image_tools.303194
20251203-142835.548904 do_rootfs_wicenv (303195): log.do_rootfs_wicenv.303195
20251203-142835.635904 do_image_squashfs (303216): log.do_image_squashfs.303216
20251203-142853.614060 do_image_verity (305205): log.do_image_verity.305205
20251203-142916.978304 do_image_wic (309278): log.do_image_wic.309278
20251203-145901.333675 do_image_wic (953): log.do_image_wic.953

To ensure that a custom initrd is always build attach the dependency
to do_image_tools instead.

This fixes a problem with the new IMAGE_INITRD variable in case of
a multiconfig with two custom initrds.

Fixes: c3c4e72cbfc4 ("image: introduce IMAGE_INITRD, deprecate INITRD_IMAGE")

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
Changes v2: Add missing fixes tag

 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d367d8c7..8c18c544 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -32,7 +32,7 @@  IMAGE_INITRD ?= ""
 INITRD_DEPLOY_FILE = "${@ d.getVar('IMAGE_INITRD') or '${PN}' }-${DISTRO}-${MACHINE}.initrd.img"
 
 # Make sure dependent initramfs recipe is built
-do_image[depends] += "${@ '${IMAGE_INITRD}:do_build' if '${IMAGE_INITRD}' else '' }"
+do_image_tools[depends] += "${@ '${IMAGE_INITRD}:do_build' if '${IMAGE_INITRD}' else '' }"
 
 # Produce warning(s) if INITRD_IMAGE is used
 python() {