From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 23 Sep 2014 14:56:31 +0000 (+0100)
Subject: oe-init-build-env-memres: Fix automatic port usage
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~32349
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=982553b6d56ca4bfd095c1bcb736ae3b77deefa7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

oe-init-build-env-memres: Fix automatic port usage

The use of an automatic port wasn't working correctly since the server
was never getting started when port == -1. This fixes things so the
server is started when port is not specified (i.e. automatic) ensuring
this happens before BBSERVER is set.

[YOCTO #6563]

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

diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index 00079989dc6..9b9e0f44b00 100755
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -60,14 +60,14 @@ if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null ; then
     res=$?
 fi
 
+if [ $res != 0 ] ; then
+    bitbake --server-only -t xmlrpc -B localhost:$port
+fi
+
 if [ $port = -1 ] ; then
     export BBSERVER=localhost:-1
     echo "Bitbake server started on demand as needed, use bitbake -m to shut it down"
 else
-    if [ $res != 0 ] ; then
-	bitbake --server-only -t xmlrpc -B localhost:$port
-    fi
-
     export BBSERVER=`cat bitbake.lock`
 
     if [ $res = 0 ] ; then