From 0b06b69992dd3df1dfff7bde694d7ad23d8d15a0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 16 Mar 2011 16:51:40 +0000 Subject: 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] Signed-off-by: Paul Eggleton --- scripts/bitbake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/bitbake') diff --git a/scripts/bitbake b/scripts/bitbake index cad4dbe1b..29e7bcd8f 100755 --- a/scripts/bitbake +++ b/scripts/bitbake @@ -27,6 +27,7 @@ OLDPATH=$PATH export PATH=`echo $PATH | sed s#[^:]*/scripts:##` if [ $buildpseudo = "1" ]; then echo "Pseudo is not present but is required, building this first before the main build" + export PSEUDO_BUILD=1 bitbake pseudo-native tar-replacement-native -c populate_sysroot ret=$? if [ "$ret" != "0" ]; then @@ -44,9 +45,11 @@ fi 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 $BITBAKE $@ fi ret=$? -- cgit v1.2.3