diff options
author | Pavel Zhukov <pavel@zhukoff.net> | 2023-02-16 13:23:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-26 11:49:00 +0000 |
commit | 4add8776ab6927304296c916ee015fa0f57389ba (patch) | |
tree | 0f5d9b97e3f1bfc0c44ee8314900d2c58745c8d1 /scripts/lib/wic/plugins | |
parent | 72201b63f63e06005038550bc957aef98756c998 (diff) | |
download | poky-4add8776ab6927304296c916ee015fa0f57389ba.tar.gz |
wic: Fix populating of IMAGE_EFI_BOOT_FILES with uefi-kernel
wic plugin crashed if IMAGE_EFI_BOOT_FILES is not empty and uefi-kernel
loader specified because of preliminary return from the function.
[Yocto #15033]
Fixes:
| File "/mnt/builds/yocto/sources/scripts/lib/wic/plugins/source/bootimg-efi.py", line 371, in do_prepare_partition
| for src_path, dst_path in cls.install_task:
| ^^^^^^^^^^^^^^^^
| AttributeError: type object 'BootimgEFIPlugin' has no attribute 'install_task'. Did you mean: 'do_install_disk'?
(From OE-Core rev: a6372f70f31b39ce9867b705d02205621d7a8685)
Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins')
-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 4b00913a70..d6aeab2aad 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -221,7 +221,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
221 | elif source_params['loader'] == 'systemd-boot': | 221 | elif source_params['loader'] == 'systemd-boot': |
222 | cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) | 222 | cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) |
223 | elif source_params['loader'] == 'uefi-kernel': | 223 | elif source_params['loader'] == 'uefi-kernel': |
224 | return | 224 | pass |
225 | else: | 225 | else: |
226 | raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) | 226 | raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) |
227 | except KeyError: | 227 | except KeyError: |