summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 14:08:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:06:56 +0100
commit9496d4cd77ae632251b4262b63be857fc4fcb31e (patch)
tree97615f1e5b6fede8a9c9fc7fb31a718c9b1d32b1 /scripts
parent0cc479699fe885049625d54c712b500c1b719e75 (diff)
downloadopenembedded-core-9496d4cd77ae632251b4262b63be857fc4fcb31e.tar.gz
openembedded-core-9496d4cd77ae632251b4262b63be857fc4fcb31e.tar.bz2
openembedded-core-9496d4cd77ae632251b4262b63be857fc4fcb31e.zip
scripts/oe-buildenv-internal: Ensure we detect the SDK/ADT and error out
The SDK/ADT may ship with a python installed which may not have all the modules need for a bitbake build. We should therefore detect if its already present in the environment and error out in this case, asking the user to use a clean environment. This also removes the potential for any other conflict between the two. [YOCTO #2979] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-buildenv-internal5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 32c0ba02d6..01fffba625 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -24,6 +24,11 @@ if [ -z "$OEROOT" ]; then
return 1
fi
+if [ ! -z "$OECORE_SDK_VERSION" ]; then
+ echo >&2 "Error: The OE SDK/ADT was detected as already being present in this shell environment. Please use a clean shell when sourcing this environment script."
+ return 1
+fi
+
if [ "x$BDIR" = "x" ]; then
if [ "x$1" = "x" ]; then
BDIR="build"