[oe-commits] Richard Purdie : scripts/oe-buildenv-internal: Ensure we detect the SDK/ ADT and error out
git at git.openembedded.org
git at git.openembedded.org
Tue Oct 2 16:18:47 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 9496d4cd77ae632251b4262b63be857fc4fcb31e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9496d4cd77ae632251b4262b63be857fc4fcb31e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue Oct 2 14:08:13 2012 +0100
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 at linuxfoundation.org>
---
scripts/oe-buildenv-internal | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 32c0ba0..01fffba 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"
More information about the Openembedded-commits
mailing list