From 3f692305dc70dacf244093a5242bcfeff1a699fd Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 28 Sep 2011 16:28:26 +0100 Subject: scripts/oe-setup-rpmrepo: use setup_tmpdir from runqemu Update the internal copy of setup_tmpdir in the oe-setup-rpmrepo script to be the same as the one in the runqemu script. (From OE-Core rev: 4a23c4dd5ab31d9642e5e49569d5c7ab77e97adf) (From OE-Core rev: 2174746ca6f480eb6387d91f9b3faf2581e816d3) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/oe-setup-rpmrepo | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo index fc2f7a8c0c..ea885f6325 100755 --- a/scripts/oe-setup-rpmrepo +++ b/scripts/oe-setup-rpmrepo @@ -35,19 +35,20 @@ fi 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 + # Try to 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` + if [ -z "$TMPDIR" ]; then + echo "Error: this script needs to be run from your build directory," + echo "or you need to explicitly set TMPDIR in your environment" + exit 1 fi fi } -- cgit v1.2.3-54-g00ecf