From 113398d2587fa507be710ade46bb90e284292975 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 4 Oct 2013 14:14:10 +0100
Subject: [PATCH] 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.

(From OE-Core rev: 5cc4d315709de195bfb0655c2f00ae2267bfa4c6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 oe-init-build-env | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 && \