diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-03-22 02:48:21 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-25 10:29:16 +0000 |
| commit | e0bc781ce06262632fec441b47551abe116458d4 (patch) | |
| tree | aee44928d2cfcac964af77e2d999e331f743450c /meta/classes/syslinux.bbclass | |
| parent | 1b1de893049ac7dabb7f028b1a322082f1b3605c (diff) | |
| download | openembedded-core-contrib-e0bc781ce06262632fec441b47551abe116458d4.tar.gz | |
bootimg.bbclass: only inherit syslinux when pcbios
syslinux.bbclass should not be seen when use efi.
(From OE-Core rev: f994eef0aeae861857756d3cc05c49cca17bd12b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/syslinux.bbclass')
| -rw-r--r-- | meta/classes/syslinux.bbclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 6de656bc13..7d324c31de 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -20,7 +20,7 @@ do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \ syslinux-native:do_populate_sysroot" -ISOLINUXDIR = "/isolinux" +ISOLINUXDIR ?= "/isolinux" SYSLINUXDIR = "/" # The kernel has an internal default console, which you can override with # a console=...some_tty... @@ -30,10 +30,9 @@ SYSLINUX_SERIAL_TTY ?= "console=ttyS0,115200" SYSLINUX_PROMPT ?= "0" SYSLINUX_TIMEOUT ?= "50" AUTO_SYSLINUXMENU ?= "1" -ISO_BOOTIMG = "isolinux/isolinux.bin" -ISO_BOOTCAT = "isolinux/boot.cat" -MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table" SYSLINUX_ROOT ?= "${ROOT}" +SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg" +SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg" APPEND_prepend = " ${SYSLINUX_ROOT} " # Need UUID utility code. |