]> code.ossystems Code Review - openembedded-core.git/commitdiff
Revert "cml1.bbclass: wait until menuconfig terminal finishes"
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Mon, 7 Aug 2017 19:21:50 +0000 (12:21 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 8 Aug 2017 15:22:17 +0000 (16:22 +0100)
This reverts commit d2ebee7c3a0c8ab9a09ebad12a2fda51f8d10954.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/cml1.bbclass

index 0bab22efed76693a7614b1ed4b8b3823abe0e683..eb8e7907f602cb038e6ac69ffbe4c51fb064ecee 100644 (file)
@@ -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'):