From 49c638264c9fd83241ff75194439af0bb5b9e005 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Wed, 28 Feb 2018 18:15:07 -0800 Subject: syslinux.bbclass: don't use vmlinuz We can't guarantee the kernel will be named vmlinuz anymore. Use KERNEL_IMAGETYPE instead. (From OE-Core rev: 8e9a5350e51d4c3be5417e55e4fd1428f49f3d8b) Signed-off-by: California Sullivan Signed-off-by: Richard Purdie --- meta/classes/syslinux.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/classes/syslinux.bbclass') diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index d6f882420e..959aed4fb8 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -21,6 +21,7 @@ do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \ syslinux-native:do_populate_sysroot" ISOLINUXDIR ?= "/isolinux" +KERNEL_IMAGETYPE ??= "bzImage" SYSLINUXDIR = "/" # The kernel has an internal default console, which you can override with # a console=...some_tty... @@ -173,8 +174,9 @@ python build_syslinux_cfg () { if not root: bb.fatal('SYSLINUX_ROOT not defined') + kernel = localdata.getVar('KERNEL_IMAGETYPE') for btype in btypes: - cfgfile.write('LABEL %s%s\nKERNEL /vmlinuz\n' % (btype[0], label)) + cfgfile.write('LABEL %s%s\nKERNEL /%s\n' % (btype[0], label, kernel)) exargs = d.getVar('SYSLINUX_KERNEL_ARGS') if exargs: -- cgit v1.2.3-54-g00ecf