summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2014-04-17 10:13:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:18 +0100
commit619c449b68eabfb75b4e3eb730f12641c0b5d85f (patch)
treea5c26c6370bfd3a8e8136924bbee83e803f28b06 /meta/lib/oe
parent8bd20eb12861c1946af63ca7b0ba5303b1b212d5 (diff)
downloadpoky-619c449b68eabfb75b4e3eb730f12641c0b5d85f.tar.gz
make menuconfig work for recent xfce environment
xfce terminal was renamed 'Terminal' -> 'xfce4-teminal' mainline end of 2012, so the distros supporting 'Terminal' will dissapear. The distros not mentionied in __init__ do (e.g fedora 19 - tested) fail - or will fail sooner or later. (From OE-Core rev: d07f3812ec371da6f18fa1dd920cdde470bd89ad) (From OE-Core rev: 9f29399dcb9eea02efbda14cc3d5bcf2e91323f6) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/terminal.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index a33abd733d..0a623c75b1 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -60,19 +60,9 @@ class Mate(XTerminal):
60 priority = 2 60 priority = 2
61 61
62class Xfce(XTerminal): 62class Xfce(XTerminal):
63 command = 'Terminal -T "{title}" -e "{command}"' 63 command = 'xfce4-terminal -T "{title}" -e "{command}"'
64 priority = 2 64 priority = 2
65 65
66 def __init__(self, command, title=None, env=None, d=None):
67 # Upstream binary name is Terminal but Debian/Ubuntu use
68 # xfce4-terminal to avoid possible(?) conflicts
69 distro = distro_name()
70 if distro == 'ubuntu' or distro == 'debian':
71 cmd = 'xfce4-terminal -T "{title}" -e "{command}"'
72 else:
73 cmd = command
74 XTerminal.__init__(self, cmd, title, env, d)
75
76class Konsole(XTerminal): 66class Konsole(XTerminal):
77 command = 'konsole -T "{title}" -e {command}' 67 command = 'konsole -T "{title}" -e {command}'
78 priority = 2 68 priority = 2