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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
4ff17dc89d
commit
3f692305dc
|
@ -35,8 +35,7 @@ fi
|
|||
|
||||
setup_tmpdir() {
|
||||
if [ -z "$TMPDIR" ]; then
|
||||
if [ "x$BUILDDIR" = "x" -o ! -d "$BUILDDIR/tmp" ]; then
|
||||
# BUILDDIR unset, try and get TMPDIR from bitbake
|
||||
# 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";
|
||||
|
@ -45,9 +44,11 @@ setup_tmpdir() {
|
|||
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
|
||||
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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue