summaryrefslogtreecommitdiff
path: root/meta/classes/syslinux.bbclass
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-13 21:29:55 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:59:16 +0000
commitbe04e3b2e13c1a7e1cd5416771b72a80ec52b8ad (patch)
tree0e8754aea179272cc69d4326e3e8dd334c3f4026 /meta/classes/syslinux.bbclass
parentbc2581aff2a859b414c8097514527a9b5b0ab2a6 (diff)
downloadopenembedded-core-be04e3b2e13c1a7e1cd5416771b72a80ec52b8ad.tar.gz
openembedded-core-be04e3b2e13c1a7e1cd5416771b72a80ec52b8ad.tar.bz2
openembedded-core-be04e3b2e13c1a7e1cd5416771b72a80ec52b8ad.tar.xz
openembedded-core-be04e3b2e13c1a7e1cd5416771b72a80ec52b8ad.zip
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 Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta/classes/syslinux.bbclass')
-rw-r--r--meta/classes/syslinux.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 1569074b2..33a509d73 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)