[oe-commits] [openembedded-core] 01/01: wic: use kernel_dir to find systemd-efi bootloader

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 552bd782d9ffe275b8fc7d7cb0b9aaceb51888c3
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: 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'
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/wic/plugins/source/bootimg-efi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.