summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-09-18 22:50:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-21 11:10:19 +0100
commit32fdbd879c83dae7c23ee0f17d0035bbae832495 (patch)
treebacf72fe63155c994f228e75f8f832f848b2223f /scripts
parentbe174d7bc35813f2648f75463abc2b41a150af51 (diff)
downloadpoky-32fdbd879c83dae7c23ee0f17d0035bbae832495.tar.gz
runqemu: show bitbake errors to user
In certain edge cases, bitbake may fail to run and cause setup_tmpdir() within runqemu to fail, and not give the user a helpful error message. Catch this case and show the user the output of bitbake -e. This fixes [YOCTO #3112] (From OE-Core rev: 465d7b6e66b5a55706535e194b3e44e11ee542c6) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index e843946e32..a9f513c7a9 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -283,8 +283,16 @@ setup_tmpdir() {
283 # We have bitbake in PATH, get OE_TMPDIR from bitbake 283 # We have bitbake in PATH, get OE_TMPDIR from bitbake
284 OE_TMPDIR=`MACHINE=$MACHINE bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` 284 OE_TMPDIR=`MACHINE=$MACHINE bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2`
285 if [ -z "$OE_TMPDIR" ]; then 285 if [ -z "$OE_TMPDIR" ]; then
286 echo "Error: this script needs to be run from your build directory," 286 # Check for errors from bitbake that the user needs to know about
287 echo "or you need to explicitly set OE_TMPDIR in your environment" 287 BITBAKE_OUTPUT=`bitbake -e | wc -l`
288 if [ "$BITBAKE_OUTPUT" -eq "0" ]; then
289 echo "Error: this script needs to be run from your build directory,"
290 echo "or you need to explicitly set OE_TMPDIR in your environment"
291 else
292 echo "There was an error running bitbake to determine TMPDIR"
293 echo "Here is the output from 'bitbake -e':"
294 bitbake -e
295 fi
288 exit 1 296 exit 1
289 fi 297 fi
290 fi 298 fi