From acf547084a68c7441797ff088490bdaa72ab7177 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 4 Oct 2013 14:17:03 +0100
Subject: [PATCH] oe-init-build-env-memres: Unset BBSERVER if already set

When starting a new server we don't want bitbake to connect to an existing
server so ensure BBSERVER is unset.

(From OE-Core rev: f54bb9e7897e6e68acb7b4f88d998fdb149a7e47)

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

diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index dca819b2eb..79b91b751a 100755
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -42,6 +42,10 @@ else
    else
       OEROOT="`pwd`"
    fi
+   if [ -n "$BBSERVER" ]; then
+      unset BBSERVER
+   fi
+            
    OEROOT=`readlink -f "$OEROOT"`
    export OEROOT
    . $OEROOT/scripts/oe-buildenv-internal && \