diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-efi.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 5cc5c8a6b8..2cfdc10ecd 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -74,8 +74,10 @@ class BootimgEFIPlugin(SourcePlugin): | |||
74 | grubefi_conf += "menuentry '%s'{\n" % (title if title else "boot") | 74 | grubefi_conf += "menuentry '%s'{\n" % (title if title else "boot") |
75 | 75 | ||
76 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") | 76 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") |
77 | if not kernel: | 77 | if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": |
78 | kernel = "bzImage" | 78 | if get_bitbake_var("INITRAMFS_IMAGE"): |
79 | kernel = "%s-%s.bin" % \ | ||
80 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) | ||
79 | 81 | ||
80 | label = source_params.get('label') | 82 | label = source_params.get('label') |
81 | label_conf = "root=%s" % creator.rootdev | 83 | label_conf = "root=%s" % creator.rootdev |
@@ -154,8 +156,10 @@ class BootimgEFIPlugin(SourcePlugin): | |||
154 | if not custom_cfg: | 156 | if not custom_cfg: |
155 | # Create systemd-boot configuration using parameters from wks file | 157 | # Create systemd-boot configuration using parameters from wks file |
156 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") | 158 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") |
157 | if not kernel: | 159 | if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": |
158 | kernel = "bzImage" | 160 | if get_bitbake_var("INITRAMFS_IMAGE"): |
161 | kernel = "%s-%s.bin" % \ | ||
162 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) | ||
159 | 163 | ||
160 | title = source_params.get('title') | 164 | title = source_params.get('title') |
161 | 165 | ||
@@ -225,8 +229,10 @@ class BootimgEFIPlugin(SourcePlugin): | |||
225 | hdddir = "%s/hdd/boot" % cr_workdir | 229 | hdddir = "%s/hdd/boot" % cr_workdir |
226 | 230 | ||
227 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") | 231 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") |
228 | if not kernel: | 232 | if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": |
229 | kernel = "bzImage" | 233 | if get_bitbake_var("INITRAMFS_IMAGE"): |
234 | kernel = "%s-%s.bin" % \ | ||
235 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) | ||
230 | 236 | ||
231 | install_cmd = "install -m 0644 %s/%s %s/%s" % \ | 237 | install_cmd = "install -m 0644 %s/%s %s/%s" % \ |
232 | (staging_kernel_dir, kernel, hdddir, kernel) | 238 | (staging_kernel_dir, kernel, hdddir, kernel) |