summaryrefslogtreecommitdiffstats
path: root/meta/classes/cml1.bbclass
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2017-08-07 12:21:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-08 16:22:17 +0100
commitda7bc68c399bbcd1baf946931200eba72268b0b3 (patch)
tree2b437942fb349887d38fb6b50509b8c33ae2df76 /meta/classes/cml1.bbclass
parent5dd65cf50273519fa45bd056b9ff342d9984a382 (diff)
downloadopenembedded-core-contrib-da7bc68c399bbcd1baf946931200eba72268b0b3.tar.gz
Revert "cml1.bbclass: wait until menuconfig terminal finishes"
This reverts commit d2ebee7c3a0c8ab9a09ebad12a2fda51f8d10954. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cml1.bbclass')
-rw-r--r--meta/classes/cml1.bbclass22
1 files changed, 1 insertions, 21 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 0bab22efed7..eb8e7907f60 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -26,28 +26,8 @@ python do_menuconfig() {
except OSError:
mtime = 0
- # We need to know when the command completes but some terminals (including gnome-terminal
- # and tmux) gives us no way to do this. We therefore write the pid to a temporal file
- # then monitor the pid until it exits.
- import tempfile
- pidfile = tempfile.NamedTemporaryFile(delete = False).name
- try:
- oe_terminal("${SHELL} -c \"echo $$ > %s; make %s; if [ \$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % (pidfile, d.getVar('KCONFIG_CONFIG_COMMAND')),
+ oe_terminal("${SHELL} -c \"make %s; if [ \$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % d.getVar('KCONFIG_CONFIG_COMMAND'),
d.getVar('PN') + ' Configuration', d)
- while os.stat(pidfile).st_size <= 0:
- continue
- with open(pidfile, "r") as f:
- pid = int(f.readline())
- finally:
- os.unlink(pidfile)
-
- import time
- while True:
- try:
- os.kill(pid, 0)
- time.sleep(0.1)
- except OSError:
- break
# FIXME this check can be removed when the minimum bitbake version has been bumped
if hasattr(bb.build, 'write_taint'):