From 81d14f5629b4eeb2096ccb52812e5775fe0125e9 Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Mon, 13 Jun 2011 19:26:16 +0200 Subject: runqemu: take TMPDIR from bitbake The old standard of using /home/anders/openembedded-core/build/tmp as TMPDIR do not work any longer, as - is appended to the real TMPDIR. Thus, always take TMPDIR from bitbake, unless TMPDIR is set in the environment. (From OE-Core rev: 993672fa2739794a6dd0dbd7bb232fa60522b897) Signed-off-by: Anders Darander Signed-off-by: Richard Purdie --- scripts/runqemu | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'scripts/runqemu') diff --git a/scripts/runqemu b/scripts/runqemu index a09362c6a1..aa44070dbe 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -262,20 +262,16 @@ SPITZ_DEFAULT_ROOTFS="core-image-sato" setup_tmpdir() { if [ -z "$TMPDIR" ]; then - if [ "x$BUILDDIR" = "x" -o ! -d "$BUILDDIR/tmp" ]; then - # BUILDDIR unset, try and get TMPDIR from bitbake - type -P bitbake &>/dev/null || { - echo "In order for this script to dynamically infer paths"; - echo "to kernels or filesystem images, you either need"; - echo "bitbake in your PATH or to source oe-init-build-env"; - echo "before running this script" >&2; - exit 1; } - - # We have bitbake in PATH, get TMPDIR from bitbake - TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` - else - TMPDIR=$BUILDDIR/tmp - fi + # BUILDDIR unset, try and get TMPDIR from bitbake + type -P bitbake &>/dev/null || { + echo "In order for this script to dynamically infer paths"; + echo "to kernels or filesystem images, you either need"; + echo "bitbake in your PATH or to source oe-init-build-env"; + echo "before running this script" >&2; + exit 1; } + + # We have bitbake in PATH, get TMPDIR from bitbake + TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` fi } -- cgit v1.2.3-54-g00ecf