Re: [PATCH 2/7] bootimg-efi-isar: Run grub-mkimage without own config

[Henning Schild <henning.schild@siemens.com>]

Am Wed, 2 Jan 2019 12:34:12 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This avoids hard-coding hd0 into the generated image. Rather rely on
> grub automatically setting 'prefix' to 'cmdpath', the location where
> the firmware started the grub executable.

This is a fork of a file from upstream wic, probably with minimal
changes. Could you double check the diff against the original file, and
check if a wic update would fix that?

Henning

> CC: Henning Schild <henning.schild@siemens.com>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 9 ---------
>  1 file changed, 9 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
> 44ce399..0d5d018 100644 ---
> a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++
> b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -91,12
> +91,6 @@ class BootimgEFIPlugin(SourcePlugin): cfg.write(grubefi_conf)
>          cfg.close()
>  
> -        cfg = open("%s/hdd/boot/EFI/BOOT/grub-mkimage.cfg" %
> cr_workdir, "w")
> -        mkimage_conf = "set root='hd0,gpt%d'\n" % bootpart.realnum
> -        mkimage_conf += "set prefix=($root)/EFI/BOOT\n"
> -        cfg.write(mkimage_conf)
> -        cfg.close()
> -
>      @classmethod
>      def do_configure_systemdboot(cls, hdddir, creator, cr_workdir,
> source_params): """
> @@ -211,8 +205,6 @@ class BootimgEFIPlugin(SourcePlugin):
>              if source_params['loader'] == 'grub-efi':
>                  shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub.cfg" %
> cr_workdir, "%s/grub.cfg" % cr_workdir)
> -
> shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub-mkimage.cfg" % cr_workdir,
> -                                "%s/grub-mkimage.cfg" % cr_workdir)
>                  for mod in [x for x in os.listdir(kernel_dir) if
> x.startswith("grub-efi-")]: cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" %
> (kernel_dir, mod, hdddir, mod[9:]) exec_cmd(cp_cmd, True)
> @@ -245,7 +237,6 @@ class BootimgEFIPlugin(SourcePlugin):
>  
>                      # TODO: check that grub-mkimage is available
>                      grub_cmd = "grub-mkimage -p /EFI/BOOT "
> -                    grub_cmd += "-c %s/grub-mkimage.cfg " %
> cr_workdir grub_cmd += "-O %s -o %s/EFI/BOOT/%s " \
>                                  % (grub_target, bootimg_dir,
> grub_image) grub_cmd += "part_gpt part_msdos ntfs ntfscomp fat ext2 "