Re: [PATCH] wic: Fix non-existing initrd case

[Jan Kiszka <jan.kiszka@siemens.com>]

On 17.10.22 09:49, Henning Schild wrote:
> Am Sun, 16 Oct 2022 13:22:52 +0200
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> 
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> An initrd is optional, and most callers of isar_get_filenames are
>> taking this into acount already. Adjust the last one and stop bailing
>> out from the helper if there is no initrd file.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  meta/scripts/lib/wic/plugins/isarpluginbase.py            | 2 +-
>>  .../scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py | 8
>> +++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/scripts/lib/wic/plugins/isarpluginbase.py
>> b/meta/scripts/lib/wic/plugins/isarpluginbase.py index
>> 68af2208..99e552e0 100644 ---
>> a/meta/scripts/lib/wic/plugins/isarpluginbase.py +++
>> b/meta/scripts/lib/wic/plugins/isarpluginbase.py @@ -36,6 +36,6 @@
>> def isar_get_filenames(rootfs_dir): if not
>> os.path.isfile(os.path.join(rootfs_dir, "boot", kernel)): raise
>> WicError("kernel %s not found" % (os.path.join(rootfs_dir, "boot",
>> kernel))) if not os.path.isfile(os.path.join(rootfs_dir, "boot",
>> initrd)):
>> -        raise WicError("initrd %s not found" %
>> (os.path.join(rootfs_dir, "boot", initrd)))
>> +        initrd = None
>>  
>>      return kernel, initrd
>> diff --git
>> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py
>> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py index
>> 7fb0f2a8..43f4bec4 100644 ---
>> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++
>> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@
>> -141,9 +141,11 @@ class BootimgPcbiosIsarPlugin(SourcePlugin):
>> syslinux_conf += "APPEND label=boot root=%s %s\n" % \
>> (creator.rootdev, bootloader.append) 
>> -            # we are using an initrd, smuggle it in
>> -            syslinux_conf = syslinux_conf.replace(" root=%s " %
>> (creator.rootdev),
>> -                                                  " root=%s
>> initrd=%s " % (creator.rootdev, initrd))
>> +            # if we are using an initrd, smuggle it in
>> +            if initrd:
>> +                syslinux_conf = syslinux_conf.replace(
>> +                    " root=%s " % (creator.rootdev),
>> +                    " root=%s initrd=%s " % (creator.rootdev,
>> initrd))
> 
> I did not check but am pretty sure this is forking patch we should
> rather get applied in OE first.
> 

Forking -isar in OE core??? Hard to believe ;)

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux