From 8531da5be425f20d4d07a46d8c7c892036b7f107 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Oct 2012 14:08:13 +0100 Subject: [PATCH] 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] (From OE-Core rev: 9496d4cd77ae632251b4262b63be857fc4fcb31e) Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 5 +++++ 1 file changed, 5 insertions(+) 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" -- 2.7.4