summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2015-06-02 14:54:27 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-27 22:42:51 +0100
commita8ae7317e2da254f65d05497b5eaae9d57c5c1e9 (patch)
treea28029a71ec6227e83458c711818be9787e89fed /meta/lib
parente8af6ad7939407f744e2ef12ae0b592ffac85255 (diff)
downloadpoky-a8ae7317e2da254f65d05497b5eaae9d57c5c1e9.tar.gz
terminal.py: Allow devshell/menuconfig on recent gnome-terminal
Recent versions of gnome-terminal does not support non-UTF8 charset: https://bugzilla.gnome.org/show_bug.cgi?id=732127 as a result, devshell and menuconfig tasks silently hang (error found on trace log of 'strace -f -v -s 8192 -e write=2 bitbake -c devshell quilt-native': "Non UTF-8 locale (ANSI_X3.4-1968) is not supported!"). As a workaround, clearing the LC_ALL environment variable so it uses the locale. Once fixed on the gnome-terminal project, this should be removed. Tested on gnome-terminal versions: GNOME Terminal 3.4.1.1 GNOME Terminal 3.14.2 (Default on Ubuntu 15.04) [YOCTO #7791] (From OE-Core rev: ec79684a1eb594099d342a416ba3f5ad0b342a53) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/terminal.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 4f5c611615..52a891388a 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -57,6 +57,12 @@ class Gnome(XTerminal):
57 priority = 2 57 priority = 2
58 58
59 def __init__(self, sh_cmd, title=None, env=None, d=None): 59 def __init__(self, sh_cmd, title=None, env=None, d=None):
60 # Recent versions of gnome-terminal does not support non-UTF8 charset:
61 # https://bugzilla.gnome.org/show_bug.cgi?id=732127; as a workaround,
62 # clearing the LC_ALL environment variable so it uses the locale.
63 # Once fixed on the gnome-terminal project, this should be removed.
64 if os.getenv('LC_ALL'): os.putenv('LC_ALL','')
65
60 # Check version 66 # Check version
61 vernum = check_terminal_version("gnome-terminal") 67 vernum = check_terminal_version("gnome-terminal")
62 if vernum and LooseVersion(vernum) >= '3.10': 68 if vernum and LooseVersion(vernum) >= '3.10':