diff mbox series

rootfs: Fix disabling of initrd generation if there is a custom one

Message ID 548d8ad4-cb74-46e6-87b8-47d79975176d@siemens.com
State New
Headers show
Series rootfs: Fix disabling of initrd generation if there is a custom one | expand

Commit Message

Jan Kiszka Nov. 29, 2025, 3:13 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

The variable is now called IMAGE_INITRD.

Fixes: c3c4e72cbfc4 ("image: introduce IMAGE_INITRD, deprecate INITRD_IMAGE")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/rootfs.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 70d4bfb8..eb5645af 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -23,7 +23,7 @@  ROOTFS_INITRAMFS_GENERATOR_CMD = "${@ d.getVar('ROOTFS_INITRAMFS_GENERATOR_CMDLI
 ROOTFS_INITRAMFS_GENERATOR_CMDLINE = "${@ initramfs_generator_cmdline(d)}"
 ROOTFS_BASE_DISTRO ?= "${BASE_DISTRO}"
 
-INITRD_IMAGE ?= ""
+IMAGE_INITRD ?= ""
 
 # Features of the rootfs creation:
 # available features are:
@@ -33,7 +33,7 @@  INITRD_IMAGE ?= ""
 # 'clean-log-files' - delete log files that are not owned by packages
 # 'populate-systemd-preset' - enable systemd units according to systemd presets
 # 'generate-initrd' - generate debian default initrd
-ROOTFS_FEATURES += "${@ 'generate-initrd' if d.getVar('INITRD_IMAGE') == '' else ''}"
+ROOTFS_FEATURES += "${@ 'generate-initrd' if d.getVar('IMAGE_INITRD') == '' else ''}"
 
 ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes"