diff options
| author | Morten Minde Neergaard <mneergaa@cisco.com> | 2012-10-19 12:37:07 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-24 12:47:28 +0100 |
| commit | c76da87511d2668479745c2f18b8a9b8116c7489 (patch) | |
| tree | fcdb9e6b82b71ae323533326729e8efd3d08eac0 /meta/classes/terminal.bbclass | |
| parent | 77cc57b88a7377e40361428dba52cf35fb7e9e58 (diff) | |
| download | openembedded-core-c76da87511d2668479745c2f18b8a9b8116c7489.tar.gz openembedded-core-c76da87511d2668479745c2f18b8a9b8116c7489.tar.bz2 openembedded-core-c76da87511d2668479745c2f18b8a9b8116c7489.zip | |
terminal: Add support for running custom terminals.
Example config:
OE_TERMINAL = "custom"
OE_TERMINAL_CUSTOMCMD = "mysuperterm"
Signed-off-by: Morten Minde Neergaard <mneergaa@cisco.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/terminal.bbclass')
| -rw-r--r-- | meta/classes/terminal.bbclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass index 2cd6f4c34f..51846c125c 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass @@ -4,7 +4,7 @@ OE_TERMINAL[choices] = 'auto none \ ${@" ".join(o.name \ for o in oe.terminal.prioritized())}' -OE_TERMINAL_EXPORTS = 'XAUTHORITY SHELL DBUS_SESSION_BUS_ADDRESS DISPLAY EXTRA_OEMAKE SCREENDIR' +OE_TERMINAL_EXPORTS += 'XAUTHORITY SHELL DBUS_SESSION_BUS_ADDRESS DISPLAY EXTRA_OEMAKE SCREENDIR' OE_TERMINAL_EXPORTS[type] = 'list' XAUTHORITY ?= "${HOME}/.Xauthority" @@ -15,17 +15,19 @@ def oe_terminal(command, title, d): import oe.data import oe.terminal + env = dict() + for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d): value = d.getVar(export, True) if value is not None: - os.environ[export] = str(value) + env[export] = str(value) terminal = oe.data.typed_value('OE_TERMINAL', d).lower() if terminal == 'none': bb.fatal('Devshell usage disabled with OE_TERMINAL') elif terminal != 'auto': try: - oe.terminal.spawn(terminal, command, title, None, d) + oe.terminal.spawn(terminal, command, title, env, d) return except oe.terminal.UnsupportedTerminal: bb.warn('Unsupported terminal "%s", defaulting to "auto"' % @@ -34,7 +36,7 @@ def oe_terminal(command, title, d): bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc)) try: - oe.terminal.spawn_preferred(command, title, None, d) + oe.terminal.spawn_preferred(command, title, env, d) except oe.terminal.NoSupportedTerminals: bb.fatal('No valid terminal found, unable to open devshell') except oe.terminal.ExecutionError as exc: |