summaryrefslogtreecommitdiffstats
path: root/scripts/bitbake
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-03-16 16:51:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-17 00:18:14 +0000
commit3046a96bf0bdb1ca32db96a11a372a0e09f91856 (patch)
tree866eec977e5324bc9595aaa437087271bbf503b6 /scripts/bitbake
parent275241ea681a8a6019b89c41ec39d65c45b851f3 (diff)
downloadpoky-3046a96bf0bdb1ca32db96a11a372a0e09f91856.tar.gz
sanity: detect if bitbake wrapper is not being used or pseudo is broken
* Shows a warning during sanity checking if the scripts/bitbake wrapper is not being used * Check to see if pseudo is working during sanity checking, and if it isn't an error occurs (if we are using the wrapper script and pseudo has been built; otherwise it is a warning). Fixes [YOCTO #653] (From OE-Core rev: 0b06b69992dd3df1dfff7bde694d7ad23d8d15a0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/bitbake')
-rwxr-xr-xscripts/bitbake3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/bitbake b/scripts/bitbake
index cad4dbe1b4..29e7bcd8fe 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -27,6 +27,7 @@ OLDPATH=$PATH
27export PATH=`echo $PATH | sed s#[^:]*/scripts:##` 27export PATH=`echo $PATH | sed s#[^:]*/scripts:##`
28if [ $buildpseudo = "1" ]; then 28if [ $buildpseudo = "1" ]; then
29 echo "Pseudo is not present but is required, building this first before the main build" 29 echo "Pseudo is not present but is required, building this first before the main build"
30 export PSEUDO_BUILD=1
30 bitbake pseudo-native tar-replacement-native -c populate_sysroot 31 bitbake pseudo-native tar-replacement-native -c populate_sysroot
31 ret=$? 32 ret=$?
32 if [ "$ret" != "0" ]; then 33 if [ "$ret" != "0" ]; then
@@ -44,9 +45,11 @@ fi
44BITBAKE=`which bitbake` 45BITBAKE=`which bitbake`
45export PATH=$OLDPATH 46export PATH=$OLDPATH
46if [ $needpseudo = "1" ]; then 47if [ $needpseudo = "1" ]; then
48 export PSEUDO_BUILD=2
47 PSEUDOBINDIR=`cat $BUILDDIR/pseudodone` 49 PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
48 PSEUDO_BINDIR=$PSEUDOBINDIR PSEUDO_LIBDIR=$PSEUDOBINDIR/../lib/pseudo/lib PSEUDO_PREFIX=$PSEUDOBINDIR/../../ PSEUDO_DISABLED=1 $PSEUDOBINDIR/pseudo $BITBAKE $@ 50 PSEUDO_BINDIR=$PSEUDOBINDIR PSEUDO_LIBDIR=$PSEUDOBINDIR/../lib/pseudo/lib PSEUDO_PREFIX=$PSEUDOBINDIR/../../ PSEUDO_DISABLED=1 $PSEUDOBINDIR/pseudo $BITBAKE $@
49else 51else
52 export PSEUDO_BUILD=0
50 $BITBAKE $@ 53 $BITBAKE $@
51fi 54fi
52ret=$? 55ret=$?