summaryrefslogtreecommitdiff
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:08:54 +0000
commit0b06b69992dd3df1dfff7bde694d7ad23d8d15a0 (patch)
tree5bc5bde390bd47e4ee8a0ec53b518078cdaa912c
parent89a5ad96eef411dccea817a6c37cb1e24840fdc1 (diff)
downloadopenembedded-core-0b06b69992dd3df1dfff7bde694d7ad23d8d15a0.tar.gz
openembedded-core-0b06b69992dd3df1dfff7bde694d7ad23d8d15a0.tar.bz2
openembedded-core-0b06b69992dd3df1dfff7bde694d7ad23d8d15a0.tar.xz
openembedded-core-0b06b69992dd3df1dfff7bde694d7ad23d8d15a0.zip
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>
-rw-r--r--meta/classes/sanity.bbclass25
-rwxr-xr-xscripts/bitbake3
-rwxr-xr-xscripts/poky-env-internal2
3 files changed, 28 insertions, 2 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index a6d320b16..6e13d2ac4 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -40,7 +40,26 @@ def check_sanity_tmpdir_change(tmpdir):
def check_sanity_version_change():
# Sanity checks to be done when SANITY_VERSION changes
return ""
-
+
+def check_pseudo_wrapper():
+ import subprocess as sub
+ # Check if bitbake wrapper is being used
+ pseudo_build = os.environ.get( 'PSEUDO_BUILD' )
+ if not pseudo_build:
+ bb.warn("Bitbake has not been run using the bitbake wrapper (scripts/bitbake); this is likely because your PATH has been altered from that normally set up by the poky-init-build-env script. Not using the wrapper may result in failures during package installation, so it is highly recommended that you set your PATH back so that the wrapper script is being executed.")
+
+ if (not pseudo_build) or pseudo_build == '2':
+ # pseudo ought to be working, let's see if it is...
+ p = sub.Popen(['sh', '-c', 'PSEUDO_DISABLED=0 id -u'],stdout=sub.PIPE,stderr=sub.PIPE)
+ out, err = p.communicate()
+ if out.rstrip() != '0':
+ msg = "Pseudo is not functioning correctly, which will cause failures during package installation. Please check your configuration."
+ if pseudo_build == '2':
+ return msg
+ else:
+ bb.warn(msg)
+ return ""
+
def check_create_long_filename(filepath, pathname):
testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)]))
try:
@@ -187,6 +206,10 @@ def check_sanity(e):
missing = missing.rstrip(',')
messages = messages + "Please install following missing utilities: %s\n" % missing
+ pseudo_msg = check_pseudo_wrapper()
+ if pseudo_msg != "":
+ messages = messages + pseudo_msg + '\n'
+
# Check if DISPLAY is set if IMAGETEST is set
if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
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=$?
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 724a6e4e5..554945452 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