diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-03-16 16:51:40 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-17 00:08:54 +0000 |
| commit | 0b06b69992dd3df1dfff7bde694d7ad23d8d15a0 (patch) | |
| tree | 5bc5bde390bd47e4ee8a0ec53b518078cdaa912c /scripts | |
| parent | 89a5ad96eef411dccea817a6c37cb1e24840fdc1 (diff) | |
| download | openembedded-core-contrib-0b06b69992dd3df1dfff7bde694d7ad23d8d15a0.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]
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bitbake | 3 | ||||
| -rwxr-xr-x | scripts/poky-env-internal | 2 |
2 files changed, 4 insertions, 1 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 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=$? diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 724a6e4e5c..554945452a 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -55,6 +55,6 @@ unset BITBAKEDIR export BUILDDIR export PATH -export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND PSEUDO_DISABLED" +export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND PSEUDO_DISABLED PSEUDO_BUILD" export BBFETCH2=True |