sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

scripts/bitbake: try harder to check if pseudo exists 

If pseudodone doesn't exist, we can get STAGING_BINDIR_NATIVE by calling
bitbake -e and use that as the path to check for pseudo before we give
up and try to build it explicitly first.

This is useful for people who share TMPDIR between multiple build
directories.

(From OE-Core rev: 07b0dddab901510208fab44bbc2566d3c3baae93)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2012-03-26 13:44:28 +01:00 committed by Richard Purdie
parent 6302003eb4
commit 299f890f6d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/bitbake
View File

@ -53,8 +53,12 @@ if [ "`pwd`" != "$BUILDDIR" ] ; then
fi fi
buildpseudo="1" buildpseudo="1"
if [ $needpseudo = "1" ] && [ -e "$BUILDDIR/pseudodone" ]; then if [ $needpseudo = "1" ]; then
PSEUDOBINDIR=`cat $BUILDDIR/pseudodone` if [ -e "$BUILDDIR/pseudodone" ]; then
PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
else
PSEUDOBINDIR=`bitbake -e | grep STAGING_BINDIR_NATIVE=\" | cut -d '=' -f2 | cut -d '"' -f2`
fi
if [ -e "$PSEUDOBINDIR/pseudo" ]; then if [ -e "$PSEUDOBINDIR/pseudo" ]; then
buildpseudo="0" buildpseudo="0"
fi fi
@ -69,6 +73,9 @@ if [ $needpseudo = "1" ] && [ -e "$BUILDDIR/pseudodone" ]; then
buildpseudo="2" buildpseudo="2"
fi fi
fi fi
if [ $buildpseudo = "0" -a ! -e "$BUILDDIR/pseudodone" ] ; then
echo $PSEUDOBINDIR > $BUILDDIR/pseudodone
fi
fi fi
# If tar is already built, we don't want to do it again... # If tar is already built, we don't want to do it again...
@ -130,7 +137,6 @@ BITBAKE=`which bitbake`
export PATH=$OLDPATH export PATH=$OLDPATH
if [ $needpseudo = "1" ]; then if [ $needpseudo = "1" ]; then
export PSEUDO_BUILD=2 export PSEUDO_BUILD=2
PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
PSEUDO_BINDIR=$PSEUDOBINDIR PSEUDO_LIBDIR=$PSEUDOBINDIR/../lib/pseudo/lib PSEUDO_PREFIX=$PSEUDOBINDIR/../../ PSEUDO_DISABLED=1 $PSEUDOBINDIR/pseudo $BITBAKE $@ PSEUDO_BINDIR=$PSEUDOBINDIR PSEUDO_LIBDIR=$PSEUDOBINDIR/../lib/pseudo/lib PSEUDO_PREFIX=$PSEUDOBINDIR/../../ PSEUDO_DISABLED=1 $PSEUDOBINDIR/pseudo $BITBAKE $@
else else
export PSEUDO_BUILD=0 export PSEUDO_BUILD=0