[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5298/8267] wic: use kernel_dir to find systemd-efi bootloader

[Emmanuele Bassi <ebassi src gnome org>]

commit cc970c23a75c7d807df6b593407d6d0d1e0eb02e
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Mar 24 14:29:52 2017 +0200

    wic: use kernel_dir to find systemd-efi bootloader
    
    Fixed test failure caused by using bootimg_dir path
    instead of kernel_dir to find systemd-efi bootloader:
    FAIL: test_systemd_bootdisk (oeqa.selftest.wic.Wic)
    ...
    FileNotFoundError: [Errno 2] No such file or directory:
    'tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/recipe-sysroot/usr/share'
    
    (From OE-Core rev: 552bd782d9ffe275b8fc7d7cb0b9aaceb51888c3)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/source/bootimg-efi.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index ff76c2f..9879cb9 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -209,7 +209,7 @@ class BootimgEFIPlugin(SourcePlugin):
                 shutil.move("%s/grub.cfg" % cr_workdir,
                             "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir)
             elif source_params['loader'] == 'systemd-boot':
-                for mod in [x for x in os.listdir(bootimg_dir) if x.startswith("systemd-")]:
+                for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]:
                     cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, mod[8:])
                     exec_cmd(cp_cmd, True)
             else: