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:43:33 +0000 |
commit | cc970c23a75c7d807df6b593407d6d0d1e0eb02e (patch) | |
tree | c83346159000a5470e684e825d6edc8b95d851c7 /scripts/lib | |
parent | faf70253bae495b1c366171339073174fd6ebb76 (diff) | |
download | poky-cc970c23a75c7d807df6b593407d6d0d1e0eb02e.tar.gz |
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>
Diffstat (limited to 'scripts/lib')
-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): | |||
209 | shutil.move("%s/grub.cfg" % cr_workdir, | 209 | shutil.move("%s/grub.cfg" % cr_workdir, |
210 | "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir) | 210 | "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir) |
211 | elif source_params['loader'] == 'systemd-boot': | 211 | elif source_params['loader'] == 'systemd-boot': |
212 | for mod in [x for x in os.listdir(bootimg_dir) if x.startswith("systemd-")]: | 212 | for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]: |
213 | cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, mod[8:]) | 213 | cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, mod[8:]) |
214 | exec_cmd(cp_cmd, True) | 214 | exec_cmd(cp_cmd, True) |
215 | else: | 215 | else: |