diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source')
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 14c1723577..cdc72543c2 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
| @@ -212,8 +212,8 @@ class BootimgEFIPlugin(SourcePlugin): | |||
| 212 | except KeyError: | 212 | except KeyError: |
| 213 | raise WicError("bootimg-efi requires a loader, none specified") | 213 | raise WicError("bootimg-efi requires a loader, none specified") |
| 214 | 214 | ||
| 215 | if get_bitbake_var("IMAGE_BOOT_FILES") is None: | 215 | if get_bitbake_var("IMAGE_EFI_BOOT_FILES") is None: |
| 216 | logger.debug('No boot files defined in IMAGE_BOOT_FILES') | 216 | logger.debug('No boot files defined in IMAGE_EFI_BOOT_FILES') |
| 217 | else: | 217 | else: |
| 218 | boot_files = None | 218 | boot_files = None |
| 219 | for (fmt, id) in (("_uuid-%s", part.uuid), ("_label-%s", part.label), (None, None)): | 219 | for (fmt, id) in (("_uuid-%s", part.uuid), ("_label-%s", part.label), (None, None)): |
| @@ -222,7 +222,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
| 222 | else: | 222 | else: |
| 223 | var = "" | 223 | var = "" |
| 224 | 224 | ||
| 225 | boot_files = get_bitbake_var("IMAGE_BOOT_FILES" + var) | 225 | boot_files = get_bitbake_var("IMAGE_EFI_BOOT_FILES" + var) |
| 226 | if boot_files: | 226 | if boot_files: |
| 227 | break | 227 | break |
| 228 | 228 | ||
| @@ -292,7 +292,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
| 292 | (staging_kernel_dir, kernel, hdddir, kernel) | 292 | (staging_kernel_dir, kernel, hdddir, kernel) |
| 293 | exec_cmd(install_cmd) | 293 | exec_cmd(install_cmd) |
| 294 | 294 | ||
| 295 | if get_bitbake_var("IMAGE_BOOT_FILES"): | 295 | if get_bitbake_var("IMAGE_EFI_BOOT_FILES"): |
| 296 | for src_path, dst_path in cls.install_task: | 296 | for src_path, dst_path in cls.install_task: |
| 297 | install_cmd = "install -m 0644 -D %s %s" \ | 297 | install_cmd = "install -m 0644 -D %s %s" \ |
| 298 | % (os.path.join(kernel_dir, src_path), | 298 | % (os.path.join(kernel_dir, src_path), |
