diff options
| -rwxr-xr-x | scripts/bitbake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/bitbake b/scripts/bitbake index eb9e14fae..7a59c6f52 100755 --- a/scripts/bitbake +++ b/scripts/bitbake @@ -53,8 +53,12 @@ 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" ]; then buildpseudo="0" fi @@ -69,6 +73,9 @@ if [ $needpseudo = "1" ] && [ -e "$BUILDDIR/pseudodone" ]; then buildpseudo="2" fi fi + if [ $buildpseudo = "0" -a ! -e "$BUILDDIR/pseudodone" ] ; then + echo $PSEUDOBINDIR > $BUILDDIR/pseudodone + fi fi # If tar is already built, we don't want to do it again... @@ -130,7 +137,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 |