summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2017-11-20 10:35:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-04 11:06:56 +0100
commit74fcb98dc06172b3326dbceeb3cffc76a7b9a983 (patch)
treecd01e47fa9865adc500dfccf9ef11902440fba65 /meta
parentce16d68962c36869048145799f8e6008b5929b3c (diff)
downloadpoky-74fcb98dc06172b3326dbceeb3cffc76a7b9a983.tar.gz
lib/oe/terminal.py: use an absolute path to execute oe-gnome-terminal-phonehome
A flaw was found on my Ubuntu 14.04.5 LTS, on which that gnome-terminal is the default terminal, when I run any of the tasks: bitbake busybox -c menuconfig/devshell/devpyshell bitbake virtual/kernel -c menuconfig/devshell/devpyshell I got a error as follows: "Failed to execute child process "oe-gnome-terminal-phonehome" (No such file or directory)" Seems the environment of the process calling Popen is not passed to the child process, this behaviour is a known issue in Python bug tracker: http://bugs.python.org/issue8557 It could be fixed by using an absolute path instead per test. (From OE-Core rev: 640d098ef0dc6aec8780f951578163ed3e7df349) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2117c148ef07d84bc605768e3b3671b0126b9337) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/terminal.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 3c8ef59a45..65486bfd29 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -67,7 +67,7 @@ class Gnome(XTerminal):
67 import tempfile 67 import tempfile
68 pidfile = tempfile.NamedTemporaryFile(delete = False).name 68 pidfile = tempfile.NamedTemporaryFile(delete = False).name
69 try: 69 try:
70 sh_cmd = "oe-gnome-terminal-phonehome " + pidfile + " " + sh_cmd 70 sh_cmd = bb.utils.which(os.getenv('PATH'), "oe-gnome-terminal-phonehome") + " " + pidfile + " " + sh_cmd
71 XTerminal.__init__(self, sh_cmd, title, env, d) 71 XTerminal.__init__(self, sh_cmd, title, env, d)
72 while os.stat(pidfile).st_size <= 0: 72 while os.stat(pidfile).st_size <= 0:
73 continue 73 continue
@@ -231,7 +231,6 @@ def spawn(name, sh_cmd, title=None, env=None, d=None):
231 output = output.decode("utf-8") 231 output = output.decode("utf-8")
232 if pipe.returncode != 0: 232 if pipe.returncode != 0:
233 raise ExecutionError(sh_cmd, pipe.returncode, output) 233 raise ExecutionError(sh_cmd, pipe.returncode, output)
234
235def check_tmux_pane_size(tmux): 234def check_tmux_pane_size(tmux):
236 import subprocess as sub 235 import subprocess as sub
237 # On older tmux versions (<1.9), return false. The reason 236 # On older tmux versions (<1.9), return false. The reason