[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7076/8267] Revert "cml1.bbclass: wait until menuconfig terminal finishes"
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 7076/8267] Revert "cml1.bbclass: wait until menuconfig terminal finishes"
- Date: Sun, 17 Dec 2017 05:44:25 +0000 (UTC)
commit c4b9c258d573a795a263a43dc9359f8fef0b594b
Author: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
Date: Mon Aug 7 12:21:50 2017 -0700
Revert "cml1.bbclass: wait until menuconfig terminal finishes"
This reverts commit d2ebee7c3a0c8ab9a09ebad12a2fda51f8d10954.
(From OE-Core rev: da7bc68c399bbcd1baf946931200eba72268b0b3)
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/classes/cml1.bbclass | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
---
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 0bab22e..eb8e790 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'):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]