From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 2/7] bootimg-efi-isar: Run grub-mkimage without own config
Date: Wed, 2 Jan 2019 12:34:12 +0100 [thread overview]
Message-ID: <11dba16a54299e2358ada5f6a8d27e3c03d780d8.1546428857.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1546428857.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1546428857.git.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.
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 "
--
2.16.4
next prev parent reply other threads:[~2019-01-02 11:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-02 11:34 [PATCH 0/7] Vacation hacks Jan Kiszka
2019-01-02 11:34 ` [PATCH 1/7] dpkg-raw: Respect file permissions defined by recipe Jan Kiszka
2019-01-07 13:20 ` Henning Schild
2019-01-07 13:28 ` Jan Kiszka
2019-01-07 14:19 ` Henning Schild
2019-01-07 14:20 ` Jan Kiszka
2019-01-07 14:26 ` Jan Kiszka
2019-01-07 16:28 ` Henning Schild
2019-01-07 16:54 ` Jan Kiszka
2019-01-07 17:51 ` Henning Schild
2019-01-07 18:56 ` Jan Kiszka
2019-01-09 15:37 ` Baurzhan Ismagulov
2019-01-10 1:19 ` Jan Kiszka
2019-01-15 8:19 ` Jan Kiszka
2019-01-15 10:10 ` Baurzhan Ismagulov
2019-01-15 10:13 ` Jan Kiszka
2019-01-02 11:34 ` Jan Kiszka [this message]
2019-01-07 13:22 ` [PATCH 2/7] bootimg-efi-isar: Run grub-mkimage without own config Henning Schild
2019-01-07 14:02 ` Jan Kiszka
2019-01-02 11:34 ` [PATCH 3/7] bootimg-efi-isar: Retrieve boot disk during runtime Jan Kiszka
2019-01-02 11:34 ` [PATCH 4/7] isar-cfg-localepurge: Also set /etc/default/locale Jan Kiszka
2019-01-02 11:34 ` [PATCH 5/7] Fix LIC_FILES_CHKSUM paths Jan Kiszka
2019-01-02 11:34 ` [PATCH 6/7] Move repo variables to proper conf file Jan Kiszka
2019-01-02 11:34 ` [PATCH 7/7] Move debian distro conf files to meta Jan Kiszka
2019-01-04 13:49 ` [PATCH 8/7] bootimg-efi-isar: Fix serial console setup for grub Jan Kiszka
2019-01-04 13:50 ` [PATCH 9/7] bootimg-efi-isar: Reformat generated grub.cfg Jan Kiszka
2019-01-07 6:06 ` [PATCH 10/7] bitbake.conf: Clean up and enhance OVERRIDES Jan Kiszka
2019-01-07 8:17 ` Claudius Heine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11dba16a54299e2358ada5f6a8d27e3c03d780d8.1546428857.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox