diff options
| author | California Sullivan <california.l.sullivan@intel.com> | 2018-02-28 18:15:07 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-06 06:23:06 -0800 |
| commit | 8e9a5350e51d4c3be5417e55e4fd1428f49f3d8b (patch) | |
| tree | 69c2f48c4fdc832b15985bad047f1a4224f101cc | |
| parent | 3d67edb695368bfa5917dca2aab6a8dc4c437efc (diff) | |
| download | openembedded-core-8e9a5350e51d4c3be5417e55e4fd1428f49f3d8b.tar.gz openembedded-core-8e9a5350e51d4c3be5417e55e4fd1428f49f3d8b.tar.bz2 openembedded-core-8e9a5350e51d4c3be5417e55e4fd1428f49f3d8b.zip | |
syslinux.bbclass: don't use vmlinuz
We can't guarantee the kernel will be named vmlinuz anymore. Use
KERNEL_IMAGETYPE instead.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/syslinux.bbclass | 4 |
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 \ 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: |