diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-02-25 11:22:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-26 07:47:50 +0000 |
| commit | 6d7cf8e9dd00bdff882311fecbadfadc46e9cc03 (patch) | |
| tree | 83609999dcf7a086c5b0c6d49086808690e2a072 /meta/lib | |
| parent | f160730bbdb06cca5c1443e6688365cffe6deb00 (diff) | |
| download | ast2050-yocto-poky-6d7cf8e9dd00bdff882311fecbadfadc46e9cc03.zip ast2050-yocto-poky-6d7cf8e9dd00bdff882311fecbadfadc46e9cc03.tar.gz | |
lib/oe/terminal: fix konsole terminal support for KDE 4.x
It seems that the --nofork option genuinely stops konsole from going
into the background now; I'm not sure when this changed but it does seem
to be working so we can use it. (Tested with Konsole 2.10 and 2.14.2).
Fixes [YOCTO #4934].
(From OE-Core rev: 49b21abf1020b2eefbbec98415c3d7de8827c993)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/terminal.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index fdfdde2..4f5c611 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -77,15 +77,15 @@ class Terminology(XTerminal): priority = 2 class Konsole(XTerminal): - command = 'konsole -T "{title}" -e {command}' + command = 'konsole --nofork -p tabtitle="{title}" -e {command}' priority = 2 def __init__(self, sh_cmd, title=None, env=None, d=None): # Check version vernum = check_terminal_version("konsole") - if vernum and LooseVersion(vernum) >= '2.0.0': - logger.debug(1, 'Konsole from KDE 4.x will not work as devshell, skipping') - raise UnsupportedTerminal(self.name) + if vernum and LooseVersion(vernum) < '2.0.0': + # Konsole from KDE 3.x + self.command = 'konsole -T "{title}" -e {command}' XTerminal.__init__(self, sh_cmd, title, env, d) class XTerm(XTerminal): |
