diff options
| author | Kyle Russell <bkylerussell@gmail.com> | 2014-02-19 13:30:32 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-20 14:28:13 +0000 |
| commit | be98ee879fe3d558be31cc8102dd3c8de3e22405 (patch) | |
| tree | 4a527705f08c73b08e03ad36c800c95eb750fb33 /meta/classes | |
| parent | 8e08ff46a3f0e3651fc7efdcdceb8b1f49dc1444 (diff) | |
| download | poky-be98ee879fe3d558be31cc8102dd3c8de3e22405.tar.gz | |
image-vmdk.bbclass: Don't force syslinux timeout
Don't force SYSLINUX_TIMEOUT and SYSLINUX_PROMPT if overrides have
been defined elsewhere for an image configuration.
(From OE-Core rev: a6522c19af9525a6e0bed241f2d926faaef76827)
Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image-vmdk.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass index 6a98f17b9d..fac5f71833 100644 --- a/meta/classes/image-vmdk.bbclass +++ b/meta/classes/image-vmdk.bbclass | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | #NOISO = "1" | 2 | #NOISO = "1" |
| 3 | 3 | ||
| 4 | SYSLINUX_ROOT = "root=/dev/hda2 " | 4 | SYSLINUX_ROOT = "root=/dev/hda2 " |
| 5 | SYSLINUX_PROMPT = "0" | 5 | SYSLINUX_PROMPT ?= "0" |
| 6 | SYSLINUX_TIMEOUT = "1" | 6 | SYSLINUX_TIMEOUT ?= "1" |
| 7 | SYSLINUX_LABELS = "boot" | 7 | SYSLINUX_LABELS = "boot" |
| 8 | LABELS_append = " ${SYSLINUX_LABELS} " | 8 | LABELS_append = " ${SYSLINUX_LABELS} " |
| 9 | 9 | ||