diff options
author | Chee Yang Lee <chee.yang.lee@intel.com> | 2019-06-11 14:31:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-11 13:26:55 +0100 |
commit | 97feebdf99024489113634d1cada36eb9b84e9c6 (patch) | |
tree | a43c06d315206df23b33e4dc18d1f87c21525aae /scripts/lib/wic/plugins/source/bootimg-pcbios.py | |
parent | ef8080c804d160da5e7683f28c0c5924bc98bba4 (diff) | |
download | poky-97feebdf99024489113634d1cada36eb9b84e9c6.tar.gz |
wic/plugins: kernel image refer to KERNEL_IMAGETYPE
replaced hardcoded kernel image with KERNEL_IMAGETYPE.
set kernel image to "bzImage" incase KERNEL_IMAGETYPE not set.
(From OE-Core rev: 88a9fef761c5e67b2964fedc85a7e8ad37067564)
Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-pcbios.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 6c9f54a897..670d347747 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -149,8 +149,12 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
149 | 149 | ||
150 | hdddir = "%s/hdd/boot" % cr_workdir | 150 | hdddir = "%s/hdd/boot" % cr_workdir |
151 | 151 | ||
152 | cmds = ("install -m 0644 %s/bzImage %s/vmlinuz" % | 152 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") |
153 | (staging_kernel_dir, hdddir), | 153 | if not kernel: |
154 | kernel = "bzImage" | ||
155 | |||
156 | cmds = ("install -m 0644 %s/%s %s/vmlinuz" % | ||
157 | (staging_kernel_dir, kernel, hdddir), | ||
154 | "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" % | 158 | "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" % |
155 | (bootimg_dir, hdddir), | 159 | (bootimg_dir, hdddir), |
156 | "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" % | 160 | "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" % |