summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-06-15 14:44:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-25 16:35:52 +0100
commit288dcf4238ac181fbe88e817e299912071fd9635 (patch)
tree0ea9a48de68f0cc496323736914eb90e4feff1cd /meta
parent3257a7ce19a69785012dd2cf211bbd086bf10658 (diff)
downloadpoky-288dcf4238ac181fbe88e817e299912071fd9635.tar.gz
cml1.bbclass: Only delay exit if the command fails
Rather than pause for 5 seconds, test the return code of the command and require user input before exiting on failure. This avoids pausing after successful command execution as well as possibly not waiting long enough if the user happens to be doing something else for 5 seconds. (From OE-Core rev: d99cc2b70bbda9a0cbc09a4430b871c287113041) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cml1.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index fd80c18697..67f17ad77e 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -20,7 +20,7 @@ python do_menuconfig() {
20 except OSError: 20 except OSError:
21 mtime = 0 21 mtime = 0
22 22
23 oe_terminal("${SHELL} -c \"make menuconfig; echo 'Pausing for 5 seconds'; sleep 5\"", '${PN} Configuration', d) 23 oe_terminal("${SHELL} -c \"make menuconfig; if [ $? -ne 0 ]; then echo 'Command failed.'; echo -n 'Press any key to continue... '; read r; fi\"", '${PN} Configuration', d)
24 24
25 # FIXME this check can be removed when the minimum bitbake version has been bumped 25 # FIXME this check can be removed when the minimum bitbake version has been bumped
26 if hasattr(bb.build, 'write_taint'): 26 if hasattr(bb.build, 'write_taint'):