Re: [PATCH] wic: bootimg-efi-isar: fix generating of grub.cfg for custom initrd

["'Quirin Gylstorff' via isar-users" <isar-users@googlegroups.com>]

On 1/10/25 12:50, peter.czegledy via isar-users wrote:
> From: Peter Czegledy <peter.czegledy@evosoft.com>
> 
> Specifying the initrd location via WICs sourceparams initrd argument doesn't generate the initrd location properly.
> 
> This fixes that and furthermore cleans up some related redundant assignments to kernel variable as they do not impact the final value.
> 
> Signed-off-by: Peter Czegledy <peter.czegledy@evosoft.com>
> ---
>   .../lib/wic/plugins/source/bootimg-efi-isar.py   | 16 ++++------------
>   1 file changed, 4 insertions(+), 12 deletions(-)
> 
> diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> index 50f4187d..243824ae 100644
> --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> @@ -97,20 +97,18 @@ class BootimgEFIPlugin(SourcePlugin):
>               grubefi_conf += "timeout=%s\n" % bootloader.timeout
>               grubefi_conf += "menuentry '%s'{\n" % (title if title else "boot")
>   
> -            kernel = get_bitbake_var("KERNEL_IMAGETYPE")
> -            if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1":
> -                if get_bitbake_var("INITRAMFS_IMAGE"):
> -                    kernel = "%s-%s.bin" % \
> -                        (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME"))
> -

This is a recipe fork from open-embedded and we intentionally try to 
keep the changes a small as possible to allow merging.

Quirin

>               label = source_params.get('label')
>               label_conf = "root=%s" % creator.rootdev
>               if label:
>                   label_conf = "LABEL=%s" % label
>   
> +            temp_initrd = initrd
>               kernel, initrd = isar_get_filenames(
>                   get_bitbake_var("IMAGE_ROOTFS"), get_bitbake_var("KERNEL_FILE")
>               )
> +            if temp_initrd:
> +                initrd = temp_initrd
> +
>               grubefi_conf += "linux /%s %s rootwait %s\n" \
>                   % (kernel, label_conf, bootloader.append)
>   
> @@ -179,12 +177,6 @@ class BootimgEFIPlugin(SourcePlugin):
>   
>           if not custom_cfg:
>               # Create systemd-boot configuration using parameters from wks file
> -            kernel = get_bitbake_var("KERNEL_IMAGETYPE")
> -            if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1":
> -                if get_bitbake_var("INITRAMFS_IMAGE"):
> -                    kernel = "%s-%s.bin" % \
> -                        (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME"))
> -
>               title = source_params.get('title')
>   
>               temp_initrd = initrd

-- 
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/44b4312c-82eb-499d-8f8f-fda34b4aa19b%40siemens.com.