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>
This commit is contained in:
parent
7d1e1018f4
commit
504ebf0d70
|
@ -35,19 +35,20 @@ fi
|
||||||
|
|
||||||
setup_tmpdir() {
|
setup_tmpdir() {
|
||||||
if [ -z "$TMPDIR" ]; then
|
if [ -z "$TMPDIR" ]; then
|
||||||
if [ "x$BUILDDIR" = "x" -o ! -d "$BUILDDIR/tmp" ]; then
|
# Try to get TMPDIR from bitbake
|
||||||
# BUILDDIR unset, try and get TMPDIR from bitbake
|
type -P bitbake &>/dev/null || {
|
||||||
type -P bitbake &>/dev/null || {
|
echo "In order for this script to dynamically infer paths";
|
||||||
echo "In order for this script to dynamically infer paths";
|
echo "to kernels or filesystem images, you either need";
|
||||||
echo "to kernels or filesystem images, you either need";
|
echo "bitbake in your PATH or to source oe-init-build-env";
|
||||||
echo "bitbake in your PATH or to source oe-init-build-env";
|
echo "before running this script" >&2;
|
||||||
echo "before running this script" >&2;
|
exit 1; }
|
||||||
exit 1; }
|
|
||||||
|
|
||||||
# We have bitbake in PATH, get TMPDIR from bitbake
|
# We have bitbake in PATH, get TMPDIR from bitbake
|
||||||
TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2`
|
TMPDIR=`bitbake -e | grep ^TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2`
|
||||||
else
|
if [ -z "$TMPDIR" ]; then
|
||||||
TMPDIR=$BUILDDIR/tmp
|
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
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue