summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-07-22 18:23:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-25 12:54:34 +0100
commit3fddac4ee959cc09d67a50d4623c29175bee26f0 (patch)
tree1ae27f427a64d1debbaf194bad38b5de28cdbb10 /scripts
parente9e77799a1b9dd84c1d83cbc1efcf5bdb604f7a7 (diff)
downloadpoky-3fddac4ee959cc09d67a50d4623c29175bee26f0.tar.gz
runqemu: report error if TMPDIR cannot be determined
Invoking runqemu outside of the build directory for an in-tree setup results in an empty TMPDIR because bitbake -e cannot be run to find it. A symptom of this problem is running runqemu and getting the following error: Error: Unable to find tunctl binary in <directory> Catch this case and report the error to the user. This fixes [YOCTO #1278] (From OE-Core rev: ab5544ac801a976b56468ade0f5d2e95c11feb87) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu29
1 files changed, 17 insertions, 12 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 5aed25a7e5..dacaf7caac 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -272,22 +272,27 @@ setup_tmpdir() {
272 272
273 # We have bitbake in PATH, get TMPDIR from bitbake 273 # We have bitbake in PATH, get TMPDIR from bitbake
274 TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` 274 TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2`
275 if [ -z "$TMPDIR" ]; then
276 echo "Error: this script needs to be run from your build directory,"
277 echo "or you need to explicitly set TMPDIR in your environment"
278 exit 1
279 fi
275 fi 280 fi
276} 281}
277 282
278setup_sysroot() { 283setup_sysroot() {
279 # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their 284 # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their
280 # environment script. If that variable isn't set, we're 285 # environment script. If that variable isn't set, we're
281 # either in an in-tree build scenario or the environment 286 # either in an in-tree build scenario or the environment
282 # script wasn't source'd. 287 # script wasn't source'd.
283 if [ -z "$OECORE_NATIVE_SYSROOT" ]; then 288 if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
284 setup_tmpdir 289 setup_tmpdir
285 BUILD_ARCH=`uname -m` 290 BUILD_ARCH=`uname -m`
286 BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` 291 BUILD_OS=`uname | tr '[A-Z]' '[a-z]'`
287 BUILD_SYS="$BUILD_ARCH-$BUILD_OS" 292 BUILD_SYS="$BUILD_ARCH-$BUILD_OS"
288 293
289 OECORE_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS 294 OECORE_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS
290 fi 295 fi
291} 296}
292 297
293# Locate a rootfs image based on defaults defined above 298# Locate a rootfs image based on defaults defined above