oe-init-build-env: unset BBSERVER
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 4 Oct 2013 13:14:10 +0000 (14:14 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 7 Oct 2013 08:37:31 +0000 (09:37 +0100)
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

index 68af7b5..de9692f 100755 (executable)
@@ -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 && \