mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 09:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic/plugins: kernel image refer to KERNEL_IMAGETYPE

Browse Source 
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>
This commit is contained in:
Chee Yang Lee
2019-06-11 14:31:37 +08:00
committed by Richard Purdie
parent ef8080c804
commit 97feebdf99
3 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/lib/wic/plugins/source/isoimage-isohybrid.py
View File

@@ -70,8 +70,10 @@ class IsoImagePlugin(SourcePlugin):
syslinux_conf += "DEFAULT boot\n"
syslinux_conf += "LABEL boot\n"
kernel = "/bzImage"
syslinux_conf += "KERNEL " + kernel + "\n"
kernel = get_bitbake_var("KERNEL_IMAGETYPE")
if not kernel:
kernel = "bzImage"
syslinux_conf += "KERNEL /" + kernel + "\n"
syslinux_conf += "APPEND initrd=/initrd LABEL=boot %s\n" \
% bootloader.append
@@ -114,9 +116,11 @@ class IsoImagePlugin(SourcePlugin):
grubefi_conf += "\n"
grubefi_conf += "menuentry 'boot'{\n"
kernel = "/bzImage"
kernel = get_bitbake_var("KERNEL_IMAGETYPE")
if not kernel:
kernel = "bzImage"
grubefi_conf += "linux %s rootwait %s\n" \
grubefi_conf += "linux /%s rootwait %s\n" \
% (kernel, bootloader.append)
grubefi_conf += "initrd /initrd \n"
grubefi_conf += "}\n"
@@ -268,9 +272,12 @@ class IsoImagePlugin(SourcePlugin):
if os.path.isfile("%s/initrd.cpio.gz" % cr_workdir):
os.remove("%s/initrd.cpio.gz" % cr_workdir)
# Install bzImage
install_cmd = "install -m 0644 %s/bzImage %s/bzImage" % \
(kernel_dir, isodir)
kernel = get_bitbake_var("KERNEL_IMAGETYPE")
if not kernel:
kernel = "bzImage"
install_cmd = "install -m 0644 %s/%s %s/%s" % \
(kernel_dir, kernel, isodir, kernel)
exec_cmd(install_cmd)
#Create bootloader for efi boot