summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-04 14:14:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-07 09:37:31 +0100
commit113398d2587fa507be710ade46bb90e284292975 (patch)
treef96e2cc16b659f62f906263c9753680665e2597f
parent479fcbfd3098e9157c70647c1904e0dc53afd244 (diff)
downloadpoky-113398d2587fa507be710ade46bb90e284292975.tar.gz
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>
-rwxr-xr-xoe-init-build-env5
1 files changed, 4 insertions, 1 deletions
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
35 else 35 else
36 OEROOT="`pwd`" 36 OEROOT="`pwd`"
37 fi 37 fi
38 OEROOT=`readlink -f "$OEROOT"` 38 if [ -n "$BBSERVER" ]; then
39 unset BBSERVER
40 fi
41 OEROOT=`readlink -f "$OEROOT"`
39 export OEROOT 42 export OEROOT
40 . $OEROOT/scripts/oe-buildenv-internal && \ 43 . $OEROOT/scripts/oe-buildenv-internal && \
41 $OEROOT/scripts/oe-setup-builddir && \ 44 $OEROOT/scripts/oe-setup-builddir && \