summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-28 18:15:07 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-06 06:35:42 -0800
commit49c638264c9fd83241ff75194439af0bb5b9e005 (patch)
tree6df570ebbe2c70ef4d7d40f67e033acab59f0c2e /meta
parent93e0e5f5fcc7bddb1142f7c4f03fff639f27c253 (diff)
downloadpoky-49c638264c9fd83241ff75194439af0bb5b9e005.tar.gz
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 <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/syslinux.bbclass4
1 files changed, 3 insertions, 1 deletions
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 \
21 syslinux-native:do_populate_sysroot" 21 syslinux-native:do_populate_sysroot"
22 22
23ISOLINUXDIR ?= "/isolinux" 23ISOLINUXDIR ?= "/isolinux"
24KERNEL_IMAGETYPE ??= "bzImage"
24SYSLINUXDIR = "/" 25SYSLINUXDIR = "/"
25# The kernel has an internal default console, which you can override with 26# The kernel has an internal default console, which you can override with
26# a console=...some_tty... 27# a console=...some_tty...
@@ -173,8 +174,9 @@ python build_syslinux_cfg () {
173 if not root: 174 if not root:
174 bb.fatal('SYSLINUX_ROOT not defined') 175 bb.fatal('SYSLINUX_ROOT not defined')
175 176
177 kernel = localdata.getVar('KERNEL_IMAGETYPE')
176 for btype in btypes: 178 for btype in btypes:
177 cfgfile.write('LABEL %s%s\nKERNEL /vmlinuz\n' % (btype[0], label)) 179 cfgfile.write('LABEL %s%s\nKERNEL /%s\n' % (btype[0], label, kernel))
178 180
179 exargs = d.getVar('SYSLINUX_KERNEL_ARGS') 181 exargs = d.getVar('SYSLINUX_KERNEL_ARGS')
180 if exargs: 182 if exargs: