[OE-core] [PATCH] Add support for running custom terminals.
Saul Wold
sgw at linux.intel.com
Wed Oct 24 15:08:00 UTC 2012
On 10/19/2012 03:37 AM, Morten Minde Neergaard wrote:
> Example config:
> OE_TERMINAL = "custom"
> OE_TERMINAL_CUSTOMCMD = "mysuperterm"
>
> Signed-off-by: Morten Minde Neergaard <mneergaa at cisco.com>
> ---
> meta/classes/terminal.bbclass | 10 ++++++----
> meta/lib/oe/terminal.py | 17 ++++++++++++++++-
> 2 files changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
> index 2cd6f4c..51846c1 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:
> diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
> index 71d8a43..4c1e318 100644
> --- a/meta/lib/oe/terminal.py
> +++ b/meta/lib/oe/terminal.py
> @@ -47,7 +47,7 @@ class Terminal(Popen):
>
> class XTerminal(Terminal):
> def __init__(self, sh_cmd, title=None, env=None, d=None):
> - Terminal.__init__(self, sh_cmd, title, env)
> + Terminal.__init__(self, sh_cmd, title, env, d)
> if not os.environ.get('DISPLAY'):
> raise UnsupportedTerminal(self.name)
>
> @@ -105,6 +105,21 @@ class Screen(Terminal):
> else:
> logger.warn(msg)
>
> +class Custom(Terminal):
> + command = 'false' # This is a placeholder
> + priority = 3
> +
> + def __init__(self, sh_cmd, title=None, env=None, d=None):
> + self.command = d and d.getVar('OE_TERMINAL_CUSTOMCMD', True)
> + if self.command:
> + if not '{command}' in self.command:
> + self.command += ' {command}'
> + Terminal.__init__(self, sh_cmd, title, env, d)
> + logger.warn('Custom terminal was started.')
> + else:
> + logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set')
> + raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set')
> +
>
> def prioritized():
> return Registry.prioritized()
>
Merged into OE-Core
Thanks
Sau!
More information about the Openembedded-core
mailing list