summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorDavis, Michael <michael.davis@essvote.com>2016-06-06 14:16:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-29 19:36:00 +0100
commit76a4804f2b0968c3d698bbbdc626191f77a601e0 (patch)
treeabe23d14514b40e6db74d100deaab037f4c54e2d /meta/classes
parent71ee36304657b18605155c4e85bd7b642eff8a1f (diff)
downloadpoky-76a4804f2b0968c3d698bbbdc626191f77a601e0.tar.gz
] syslinux.bbclass: Added configurable SYSLINUX_ALLOWOPTIONS variable
The new variable allows for images to be created without an editable boot line in syslinux. Default behavior remains unchanged. Backport from master (935578c139a260c18e437419be82d7fd7e8be81a) (From OE-Core rev: 9bbacbe563c1c7dd4761b30da1c10e247aa49cd8) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/syslinux.bbclass8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 4fcb0c5e72..52fb51f22f 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -30,6 +30,7 @@ SYSLINUX_SERIAL_TTY ?= "console=ttyS0,115200"
30SYSLINUX_PROMPT ?= "0" 30SYSLINUX_PROMPT ?= "0"
31SYSLINUX_TIMEOUT ?= "50" 31SYSLINUX_TIMEOUT ?= "50"
32AUTO_SYSLINUXMENU ?= "1" 32AUTO_SYSLINUXMENU ?= "1"
33SYSLINUX_ALLOWOPTIONS ?= "1"
33SYSLINUX_ROOT ?= "${ROOT}" 34SYSLINUX_ROOT ?= "${ROOT}"
34SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg" 35SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg"
35SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg" 36SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"
@@ -114,7 +115,12 @@ python build_syslinux_cfg () {
114 for opt in opts.split(';'): 115 for opt in opts.split(';'):
115 cfgfile.write('%s\n' % opt) 116 cfgfile.write('%s\n' % opt)
116 117
117 cfgfile.write('ALLOWOPTIONS 1\n'); 118 allowoptions = d.getVar('SYSLINUX_ALLOWOPTIONS', True)
119 if allowoptions:
120 cfgfile.write('ALLOWOPTIONS %s\n' % allowoptions)
121 else:
122 cfgfile.write('ALLOWOPTIONS 1\n')
123
118 syslinux_default_console = d.getVar('SYSLINUX_DEFAULT_CONSOLE', True) 124 syslinux_default_console = d.getVar('SYSLINUX_DEFAULT_CONSOLE', True)
119 syslinux_serial_tty = d.getVar('SYSLINUX_SERIAL_TTY', True) 125 syslinux_serial_tty = d.getVar('SYSLINUX_SERIAL_TTY', True)
120 syslinux_serial = d.getVar('SYSLINUX_SERIAL', True) 126 syslinux_serial = d.getVar('SYSLINUX_SERIAL', True)