From 49b21abf1020b2eefbbec98415c3d7de8827c993 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 25 Feb 2015 11:22:25 +0000 Subject: 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]. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/terminal.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index fdfdde2f91..4f5c611615 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): -- cgit 1.2.3-korg