diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-03-24 14:29:52 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-24 23:42:48 +0000 |
| commit | 552bd782d9ffe275b8fc7d7cb0b9aaceb51888c3 (patch) | |
| tree | 69b503b15c98b723e56283d2d279bcdb32d8de98 /scripts | |
| parent | 06227bc5e533841ab12cde84a6ed6f8b8ddeb5cb (diff) | |
| download | openembedded-core-552bd782d9ffe275b8fc7d7cb0b9aaceb51888c3.tar.gz openembedded-core-552bd782d9ffe275b8fc7d7cb0b9aaceb51888c3.tar.bz2 openembedded-core-552bd782d9ffe275b8fc7d7cb0b9aaceb51888c3.zip | |
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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | 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 ff76c2f16a..9879cb9fce 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: |