From: Pavel Zhukov Date: Thu, 16 Feb 2023 12:23:39 +0000 (+0100) Subject: wic: Fix populating of IMAGE_EFI_BOOT_FILES with uefi-kernel X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1572 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6372f70f31b39ce9867b705d02205621d7a8685;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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'? Signed-off-by: Pavel Zhukov Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 4b00913a700..d6aeab2aade 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): elif source_params['loader'] == 'systemd-boot': cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) elif source_params['loader'] == 'uefi-kernel': - return + pass else: raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) except KeyError: