[OE-core] [PATCH 1/2] Revert "cml1.bbclass: wait until menuconfig terminal finishes"
leonardo.sandoval.gonzalez at linux.intel.com
leonardo.sandoval.gonzalez at linux.intel.com
Mon Aug 7 19:21:50 UTC 2017
From: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
This reverts commit d2ebee7c3a0c8ab9a09ebad12a2fda51f8d10954.
---
meta/classes/cml1.bbclass | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 0bab22efed..eb8e7907f6 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'):
--
2.12.3
More information about the Openembedded-core
mailing list