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

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

['Jan Kiszka' via isar-users]

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 --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"
 
-- 
2.51.0

-- 
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 visit https://groups.google.com/d/msgid/isar-users/548d8ad4-cb74-46e6-87b8-47d79975176d%40siemens.com.

Re: [PATCH] rootfs: Fix disabling of initrd generation if there is a custom one

['Jan Kiszka' via isar-users]

On 29.11.25 16:13, 'Jan Kiszka' via isar-users wrote:
> 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.bbclc3c4e72cbfc4ass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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}"
>  c3c4e72cbfc4c3c4e72cbfc4
> -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"
>  

This was is still not on the fast path, although being a critical
regression fix. In fact, there are several more fixes related to
c3c4e72cbfc4 not yet in that track, are they?

Jan

-- 
Siemens AG, Foundational Technologies
Linux Expert Center

-- 
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 visit https://groups.google.com/d/msgid/isar-users/f86e1861-468c-4be8-8010-394a9d338602%40siemens.com.

Re: [PATCH] rootfs: Fix disabling of initrd generation if there is a custom one

[Zhihang Wei]

On 12/9/25 00:12, Jan Kiszka wrote:
> On 29.11.25 16:13, 'Jan Kiszka' via isar-users wrote:
>> 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.bbclc3c4e72cbfc4ass | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> 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}"
>>   c3c4e72cbfc4c3c4e72cbfc4
>> -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"
>>   
> This was is still not on the fast path, although being a critical
> regression fix. In fact, there are several more fixes related to
> c3c4e72cbfc4 not yet in that track, are they?
>
> Jan
>
The issue was not fully fixed in my view. The initramfs was still not
generated and I was working on a fix. The fix has been sent as "initramfs:
Restore default "generate-initrd" logic in initramfs.bbclass" and now we can
finally merge this patch as well.

Zhihang

-- 
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 visit https://groups.google.com/d/msgid/isar-users/d7e6cd58-c910-408d-8cf2-ced8efd021d5%40ilbers.de.

Re: [PATCH] rootfs: Fix disabling of initrd generation if there is a custom one

[Zhihang Wei]

Applied to next, thanks.

Zhihang

On 11/29/25 16:13, Jan Kiszka wrote:
> 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 --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"
>   

-- 
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 visit https://groups.google.com/d/msgid/isar-users/697c4c19-a24d-4bf4-9487-3f761044c677%40ilbers.de.