[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1381/8267] wic: add systemd-boot option in EFI boot image plugin

[Emmanuele Bassi <ebassi src gnome org>]

commit 3091a8c58a6272de8a26d9e00378cdeb221e068c
Author: Jianxun Zhang <jianxun zhang linux intel com>
Date:   Fri Jul 8 10:44:29 2016 -0700

    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>

 scripts/lib/wic/plugins/source/bootimg-efi.py |    8 +++++---
 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 3a16861..8bc3622 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):
     @classmethod
     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
         exec_cmd(install_cmd)
@@ -149,7 +149,8 @@ class BootimgEFIPlugin(SourcePlugin):
         try:
             if source_params['loader'] == 'grub-efi':
                 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)
             else:
                 msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader'])
@@ -189,7 +190,8 @@ class BootimgEFIPlugin(SourcePlugin):
                 exec_cmd(cp_cmd, True)
                 shutil.move("%s/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)
                 exec_cmd(cp_cmd, True)
             else: