summaryrefslogtreecommitdiffstats
path: root/meta/classes/cml1.bbclass
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:32:14 +0100
commitd99cc2b70bbda9a0cbc09a4430b871c287113041 (patch)
tree7c5df91a666686ba6f1db45df10f398fde081544 /meta/classes/cml1.bbclass
parent4199efed48005a62267fa3374c33b13627d85f44 (diff)
downloadopenembedded-core-d99cc2b70bbda9a0cbc09a4430b871c287113041.tar.gz
openembedded-core-d99cc2b70bbda9a0cbc09a4430b871c287113041.tar.bz2
openembedded-core-d99cc2b70bbda9a0cbc09a4430b871c287113041.zip
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. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta/classes/cml1.bbclass')
-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() {
except OSError:
mtime = 0
- oe_terminal("${SHELL} -c \"make menuconfig; echo 'Pausing for 5 seconds'; sleep 5\"", '${PN} Configuration', d)
+ 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)
# FIXME this check can be removed when the minimum bitbake version has been bumped
if hasattr(bb.build, 'write_taint'):