diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-26 12:56:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-16 17:57:30 +0100 |
commit | a65fd2b9d58a9b7dc4c17a557eee555356334c2c (patch) | |
tree | ae71c3a0e54fbbf03d97e5ee9201092675d24ec0 /scripts/lib/wic/plugins/source/bootimg_efi.py | |
parent | 26694f2009f5df3a740c128fa55f3ed08769ff1e (diff) | |
download | poky-a65fd2b9d58a9b7dc4c17a557eee555356334c2c.tar.gz |
wic: Update after plugin name changes
Update the plugin names to account for the "-" to "_" plugin name change.
(From OE-Core rev: afa1b5c9f6ed17c021e37a54d0d6abee50a60bf9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg_efi.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg_efi.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg_efi.py b/scripts/lib/wic/plugins/source/bootimg_efi.py index 38da5080fb..cf16705a28 100644 --- a/scripts/lib/wic/plugins/source/bootimg_efi.py +++ b/scripts/lib/wic/plugins/source/bootimg_efi.py | |||
@@ -4,7 +4,7 @@ | |||
4 | # SPDX-License-Identifier: GPL-2.0-only | 4 | # SPDX-License-Identifier: GPL-2.0-only |
5 | # | 5 | # |
6 | # DESCRIPTION | 6 | # DESCRIPTION |
7 | # This implements the 'bootimg-efi' source plugin class for 'wic' | 7 | # This implements the 'bootimg_efi' source plugin class for 'wic' |
8 | # | 8 | # |
9 | # AUTHORS | 9 | # AUTHORS |
10 | # Tom Zanussi <tom.zanussi (at] linux.intel.com> | 10 | # Tom Zanussi <tom.zanussi (at] linux.intel.com> |
@@ -32,7 +32,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
32 | This plugin supports GRUB 2 and systemd-boot bootloaders. | 32 | This plugin supports GRUB 2 and systemd-boot bootloaders. |
33 | """ | 33 | """ |
34 | 34 | ||
35 | name = 'bootimg-efi' | 35 | name = 'bootimg_efi' |
36 | 36 | ||
37 | @classmethod | 37 | @classmethod |
38 | def _copy_additional_files(cls, hdddir, initrd, dtb): | 38 | def _copy_additional_files(cls, hdddir, initrd, dtb): |
@@ -230,9 +230,9 @@ class BootimgEFIPlugin(SourcePlugin): | |||
230 | elif source_params['loader'] == 'uefi-kernel': | 230 | elif source_params['loader'] == 'uefi-kernel': |
231 | pass | 231 | pass |
232 | else: | 232 | else: |
233 | raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) | 233 | raise WicError("unrecognized bootimg_efi loader: %s" % source_params['loader']) |
234 | except KeyError: | 234 | except KeyError: |
235 | raise WicError("bootimg-efi requires a loader, none specified") | 235 | raise WicError("bootimg_efi requires a loader, none specified") |
236 | 236 | ||
237 | if get_bitbake_var("IMAGE_EFI_BOOT_FILES") is None: | 237 | if get_bitbake_var("IMAGE_EFI_BOOT_FILES") is None: |
238 | logger.debug('No boot files defined in IMAGE_EFI_BOOT_FILES') | 238 | logger.debug('No boot files defined in IMAGE_EFI_BOOT_FILES') |
@@ -365,7 +365,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
365 | out = exec_cmd(cp_cmd, True) | 365 | out = exec_cmd(cp_cmd, True) |
366 | logger.debug("uefi-kernel files:\n%s" % out) | 366 | logger.debug("uefi-kernel files:\n%s" % out) |
367 | else: | 367 | else: |
368 | raise WicError("unrecognized bootimg-efi loader: %s" % | 368 | raise WicError("unrecognized bootimg_efi loader: %s" % |
369 | source_params['loader']) | 369 | source_params['loader']) |
370 | 370 | ||
371 | # must have installed at least one EFI bootloader | 371 | # must have installed at least one EFI bootloader |
@@ -375,7 +375,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
375 | raise WicError("No EFI loaders installed to ESP partition. Check that grub-efi, systemd-boot or similar is installed.") | 375 | raise WicError("No EFI loaders installed to ESP partition. Check that grub-efi, systemd-boot or similar is installed.") |
376 | 376 | ||
377 | except KeyError: | 377 | except KeyError: |
378 | raise WicError("bootimg-efi requires a loader, none specified") | 378 | raise WicError("bootimg_efi requires a loader, none specified") |
379 | 379 | ||
380 | startup = os.path.join(kernel_dir, "startup.nsh") | 380 | startup = os.path.join(kernel_dir, "startup.nsh") |
381 | if os.path.exists(startup): | 381 | if os.path.exists(startup): |