diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-02-13 21:29:55 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-23 23:59:38 +0000 |
| commit | 4fe569e9498c9b48a2b20712aa359720ce154479 (patch) | |
| tree | 4522bc067b0443a59d11af0d753c6a738b52ce2e | |
| parent | dced0c16e86130e7b2cde7c342dfc7237dc368b9 (diff) | |
| download | ast2050-yocto-poky-4fe569e9498c9b48a2b20712aa359720ce154479.zip ast2050-yocto-poky-4fe569e9498c9b48a2b20712aa359720ce154479.tar.gz | |
syslinux: Use SYSLINUX_TIMEOUT and SYSLINUX_PROMPT to configure syslinux
syslinux allows you to set TIMEOUT and PROMPT variables, when PROMPT is 0,
the "boot:" is not displayed uless one presses CTRL or SHIFT during startup.
TIMEOUT is in 1/10th of seconds, and a value of 0 for TIMEOUT will disable
the timeout mechanism.
In bitbake, recipes had set TIMEOUT (not SYSLINUX_TIMEOUT) incorrectly, other
patches fix this issues. We are adding SYSLINUX_PROMPT to enable/disable the
"boot:" prompt in syslinux.
See http://www.syslinux.org/wiki/index.php/SYSLINUX for more details
(From OE-Core rev: be04e3b2e13c1a7e1cd5416771b72a80ec52b8ad)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/syslinux.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 1569074..33a509d 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -136,10 +136,6 @@ python build_syslinux_cfg () { except OSError: raise bb.build.funcFailed('Unable to open %s' % (cfile)) - # FIXME - the timeout should be settable - # And maybe the default too - # Definately the prompt - cfgfile.write('# Automatically created by OE\n') opts = d.getVar('SYSLINUX_OPTS', 1) @@ -158,7 +154,11 @@ python build_syslinux_cfg () { else: cfgfile.write('TIMEOUT 50\n') - cfgfile.write('PROMPT 1\n') + prompt = d.getVar('SYSLINUX_PROMPT', 1) + if prompt: + cfgfile.write('PROMPT %s\n' % prompt) + else: + cfgfile.write('PROMPT 1\n') menu = d.getVar('AUTO_SYSLINUXMENU', 1) |
