summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJianxun Zhang <jianxun.zhang@linux.intel.com>2016-07-08 10:44:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:46 +0100
commit3091a8c58a6272de8a26d9e00378cdeb221e068c (patch)
treeafc29bcaf3334b780edfc1915709a0bc23a28f28
parenta98a8180863ff45b477a1f8439ebcec21151d282 (diff)
downloadpoky-3091a8c58a6272de8a26d9e00378cdeb221e068c.tar.gz
wic: add systemd-boot option in EFI boot image plugin
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>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 3a16861204..8bc362254d 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -84,7 +84,7 @@ class BootimgEFIPlugin(SourcePlugin):
84 @classmethod 84 @classmethod
85 def do_configure_gummiboot(cls, hdddir, creator, cr_workdir): 85 def do_configure_gummiboot(cls, hdddir, creator, cr_workdir):
86 """ 86 """
87 Create loader-specific (gummiboot) config 87 Create loader-specific systemd-boot/gummiboot config
88 """ 88 """
89 install_cmd = "install -d %s/loader" % hdddir 89 install_cmd = "install -d %s/loader" % hdddir
90 exec_cmd(install_cmd) 90 exec_cmd(install_cmd)
@@ -149,7 +149,8 @@ class BootimgEFIPlugin(SourcePlugin):
149 try: 149 try:
150 if source_params['loader'] == 'grub-efi': 150 if source_params['loader'] == 'grub-efi':
151 cls.do_configure_grubefi(hdddir, creator, cr_workdir) 151 cls.do_configure_grubefi(hdddir, creator, cr_workdir)
152 elif source_params['loader'] == 'gummiboot': 152 elif source_params['loader'] == 'gummiboot' \
153 or source_params['loader'] == 'systemd-boot':
153 cls.do_configure_gummiboot(hdddir, creator, cr_workdir) 154 cls.do_configure_gummiboot(hdddir, creator, cr_workdir)
154 else: 155 else:
155 msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader']) 156 msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader'])
@@ -189,7 +190,8 @@ class BootimgEFIPlugin(SourcePlugin):
189 exec_cmd(cp_cmd, True) 190 exec_cmd(cp_cmd, True)
190 shutil.move("%s/grub.cfg" % cr_workdir, 191 shutil.move("%s/grub.cfg" % cr_workdir,
191 "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir) 192 "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir)
192 elif source_params['loader'] == 'gummiboot': 193 elif source_params['loader'] == 'gummiboot' \
194 or source_params['loader'] == 'systemd-boot':
193 cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (bootimg_dir, hdddir) 195 cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (bootimg_dir, hdddir)
194 exec_cmd(cp_cmd, True) 196 exec_cmd(cp_cmd, True)
195 else: 197 else: