diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-03-16 16:51:40 +0000 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-03-16 17:46:48 -0700 |
commit | 97532bc7597a3bfe20b8be40d53eb955e0313baf (patch) | |
tree | c988761d862b1cc65e9ea91f05cb15a0f17523c3 /scripts | |
parent | a7d927af3585403fe6eb8d184bdadd307d681e02 (diff) | |
download | poky-97532bc7597a3bfe20b8be40d53eb955e0313baf.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')
-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 | |||
27 | export PATH=`echo $PATH | sed s#[^:]*/scripts:##` | 27 | export PATH=`echo $PATH | sed s#[^:]*/scripts:##` |
28 | if [ $buildpseudo = "1" ]; then | 28 | if [ $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 | |||
44 | BITBAKE=`which bitbake` | 45 | BITBAKE=`which bitbake` |
45 | export PATH=$OLDPATH | 46 | export PATH=$OLDPATH |
46 | if [ $needpseudo = "1" ]; then | 47 | if [ $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 $@ |
49 | else | 51 | else |
52 | export PSEUDO_BUILD=0 | ||
50 | $BITBAKE $@ | 53 | $BITBAKE $@ |
51 | fi | 54 | fi |
52 | ret=$? | 55 | 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 | |||
55 | export BUILDDIR | 55 | export BUILDDIR |
56 | export PATH | 56 | export PATH |
57 | 57 | ||
58 | 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" | 58 | 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" |
59 | 59 | ||
60 | export BBFETCH2=True | 60 | export BBFETCH2=True |