[PATCH] rootfs: Restore previous naming scheme in INITRD_DEPLOY_FILE

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Might have been accidentally changed, specifically as initramfs.bbclass
was not updated as well, and that broke downstream users of
INITRD_DEPLOY_FILE via wic.

Fixes: c3c4e72cbfc4 ("image: introduce IMAGE_INITRD, deprecate INITRD_IMAGE")
Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
meta/classes/image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index b030024f..d367d8c7 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -29,7 +29,7 @@ INITRD_IMAGE ?= ""
IMAGE_INITRD ?= ""

# Name of the deployed initrd image
-INITRD_DEPLOY_FILE = "${@ d.getVar('IMAGE_INITRD') or '${PN}' }-${DISTRO}-${MACHINE}-initrd.img"
+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 '' }"
--
2.51.0

[Quirin Gylstorff]

Hi

On 11/29/25 16:13, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.k...@siemens.com>
>
> Might have been accidentally changed, specifically as initramfs.bbclass
> was not updated as well, and that broke downstream users of
> INITRD_DEPLOY_FILE via wic.
>

I test the patch in a installer image with a custom initrd something is
still broken.
I will try to get more details.

Quirin> Fixes: c3c4e72cbfc4 ("image: introduce IMAGE_INITRD, deprecate

[Quirin Gylstorff]

do_image is a virtual task and is never executed. This dependency will
not be triggered.
see *image*/temp/log.taskorder, e.g.

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


I will send a fix.

Quirin >
>