From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 4 Oct 2013 13:14:10 +0000 (+0100)
Subject: oe-init-build-env: unset BBSERVER
X-Git-Tag: 2015-4~4996
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5cc4d315709de195bfb0655c2f00ae2267bfa4c6;p=openembedded-core.git

oe-init-build-env: unset BBSERVER

If BBSERVER is set, we should unset it before proceeding. Its assumed the
user will have unloaded the server from memory should they have wished
to do so.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/oe-init-build-env b/oe-init-build-env
index 68af7b5193..de9692fe44 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -35,7 +35,10 @@ else
    else
       OEROOT="`pwd`"
    fi
-   OEROOT=`readlink -f "$OEROOT"`
+   if [ -n "$BBSERVER" ]; then
+      unset BBSERVER
+   fi
+    OEROOT=`readlink -f "$OEROOT"`
    export OEROOT
    . $OEROOT/scripts/oe-buildenv-internal && \
         $OEROOT/scripts/oe-setup-builddir && \