[OE-core] [PATCH 1/3] scripts/bitbake: try harder to check if pseudo exists
Paul Eggleton
paul.eggleton at linux.intel.com
Tue Mar 27 11:50:08 UTC 2012
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.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
scripts/bitbake | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/scripts/bitbake b/scripts/bitbake
index 45c8697..1ba1839 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -53,14 +53,21 @@ if [ "`pwd`" != "$BUILDDIR" ] ; then
fi
buildpseudo="1"
-if [ $needpseudo = "1" ] && [ -e "$BUILDDIR/pseudodone" ]; then
- PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
+if [ $needpseudo = "1" ]; then
+ 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" -a -e "$PSEUDOBINDIR/tar" -a "$needtar" = "1" ]; then
buildpseudo="0"
fi
if [ -e "$PSEUDOBINDIR/pseudo" -a $needtar = "0" ]; then
buildpseudo="0"
fi
+ if [ $buildpseudo = "0" -a ! -e "$BUILDDIR/pseudodone" ] ; then
+ echo $PSEUDOBINDIR > $BUILDDIR/pseudodone
+ fi
fi
if [ $needpseudo = "0" ]; then
buildpseudo="0"
@@ -104,7 +111,6 @@ BITBAKE=`which bitbake`
export PATH=$OLDPATH
if [ $needpseudo = "1" ]; then
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 $@
else
export PSEUDO_BUILD=0
--
1.7.5.4
More information about the Openembedded-core
mailing list