summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-28 16:28:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-28 21:41:44 +0100
commit504ebf0d7024a17d85cd103f5fe02bce0346bbae (patch)
treeedd92e7cba954a6dc142a3b6afdd32473a3f15da /scripts
parent7d1e1018f4ae0a0bd25aef1987730deb170c7f03 (diff)
downloadpoky-504ebf0d7024a17d85cd103f5fe02bce0346bbae.tar.gz
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) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-setup-rpmrepo27
1 files changed, 14 insertions, 13 deletions
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
35 35
36setup_tmpdir() { 36setup_tmpdir() {
37 if [ -z "$TMPDIR" ]; then 37 if [ -z "$TMPDIR" ]; then
38 if [ "x$BUILDDIR" = "x" -o ! -d "$BUILDDIR/tmp" ]; then 38 # Try to get TMPDIR from bitbake
39 # BUILDDIR unset, try and get TMPDIR from bitbake 39 type -P bitbake &>/dev/null || {
40 type -P bitbake &>/dev/null || { 40 echo "In order for this script to dynamically infer paths";
41 echo "In order for this script to dynamically infer paths"; 41 echo "to kernels or filesystem images, you either need";
42 echo "to kernels or filesystem images, you either need"; 42 echo "bitbake in your PATH or to source oe-init-build-env";
43 echo "bitbake in your PATH or to source oe-init-build-env"; 43 echo "before running this script" >&2;
44 echo "before running this script" >&2; 44 exit 1; }
45 exit 1; } 45
46 46 # We have bitbake in PATH, get TMPDIR from bitbake
47 # We have bitbake in PATH, get TMPDIR from bitbake 47 TMPDIR=`bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2`
48 TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` 48 if [ -z "$TMPDIR" ]; then
49 else 49 echo "Error: this script needs to be run from your build directory,"
50 TMPDIR=$BUILDDIR/tmp 50 echo "or you need to explicitly set TMPDIR in your environment"
51 exit 1
51 fi 52 fi
52 fi 53 fi
53} 54}