MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wic: add systemd-boot option in EFI boot image plugin

Browse Source 
The new systemd-boot enabled in OE is the old gummiboot
merged into systemd project. Our intention is to replace
gummiboot with systemd-boot in OE once every feature based
on gummiboot is supported with systemd-boot.

Before we can purge gummiboot, we temporarily keep both of
the two bootloaders supported.

Patch doesn't do replacement for every "gummi" occurrence.
We think cleaning can be done in background after we disable
people to use gummiboot, so we just keep change small and
safe this time.

(From OE-Core rev: daa5f8b886408eb6a17898b18ac97d5a0d76d2cc)

Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jianxun Zhang 2016-07-08 10:44:29 -07:00 committed by Richard Purdie
parent a98a818086
commit 3091a8c58a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/lib/wic/plugins/source/bootimg-efi.py
View File

@ -84,7 +84,7 @@ class BootimgEFIPlugin(SourcePlugin):
@classmethod @classmethod
def do_configure_gummiboot(cls, hdddir, creator, cr_workdir): def do_configure_gummiboot(cls, hdddir, creator, cr_workdir):
""" """
Create loader-specific (gummiboot) config Create loader-specific systemd-boot/gummiboot config
""" """
install_cmd = "install -d %s/loader" % hdddir install_cmd = "install -d %s/loader" % hdddir
exec_cmd(install_cmd) exec_cmd(install_cmd)
@ -149,7 +149,8 @@ class BootimgEFIPlugin(SourcePlugin):
try: try:
if source_params['loader'] == 'grub-efi': if source_params['loader'] == 'grub-efi':
cls.do_configure_grubefi(hdddir, creator, cr_workdir) cls.do_configure_grubefi(hdddir, creator, cr_workdir)
elif source_params['loader'] == 'gummiboot': elif source_params['loader'] == 'gummiboot' \
or source_params['loader'] == 'systemd-boot':
cls.do_configure_gummiboot(hdddir, creator, cr_workdir) cls.do_configure_gummiboot(hdddir, creator, cr_workdir)
else: else:
msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader']) msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader'])
@ -189,7 +190,8 @@ class BootimgEFIPlugin(SourcePlugin):
exec_cmd(cp_cmd, True) exec_cmd(cp_cmd, True)
shutil.move("%s/grub.cfg" % cr_workdir, shutil.move("%s/grub.cfg" % cr_workdir,
"%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir) "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir)
elif source_params['loader'] == 'gummiboot': elif source_params['loader'] == 'gummiboot' \
or source_params['loader'] == 'systemd-boot':
cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (bootimg_dir, hdddir) cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (bootimg_dir, hdddir)
exec_cmd(cp_cmd, True) exec_cmd(cp_cmd, True)
else: else: