From: Sergei Zhmylev Date: Mon, 17 Apr 2023 15:17:19 +0000 (+0300) Subject: wic: add support for proper kernel name to bootimg-pcbios X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1061 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d9f00ba456fe76e0f4ef0e68ec64fc538c90d89;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git wic: add support for proper kernel name to bootimg-pcbios Use appropriate kernel image name instead of hard-coded vmlinuz for bootimg-pcbios plugin. Signed-off-by: Sergei Zhmylev Signed-off-by: Luca Ceresoli --- diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 32e47f18314..a207a835309 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -122,7 +122,7 @@ class BootimgPcbiosPlugin(SourcePlugin): syslinux_conf += "DEFAULT boot\n" syslinux_conf += "LABEL boot\n" - kernel = "/vmlinuz" + kernel = "/" + get_bitbake_var("KERNEL_IMAGETYPE") syslinux_conf += "KERNEL " + kernel + "\n" syslinux_conf += "APPEND label=boot root=%s %s\n" % \ @@ -155,8 +155,8 @@ class BootimgPcbiosPlugin(SourcePlugin): kernel = "%s-%s.bin" % \ (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) - cmds = ("install -m 0644 %s/%s %s/vmlinuz" % - (staging_kernel_dir, kernel, hdddir), + cmds = ("install -m 0644 %s/%s %s/%s" % + (staging_kernel_dir, kernel, hdddir, get_bitbake_var("KERNEL_IMAGETYPE")), "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" % (bootimg_dir, hdddir), "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" %