summaryrefslogtreecommitdiffstats
path: root/oe-init-build-env-memres
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-23 15:56:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-23 19:59:44 +0100
commit982553b6d56ca4bfd095c1bcb736ae3b77deefa7 (patch)
treec11f408cdb1523ee84f5954c1f8d6e76ff52531e /oe-init-build-env-memres
parent7212dcb3a67b9a9b844b74e997d2e3ea7902555f (diff)
downloadopenembedded-core-982553b6d56ca4bfd095c1bcb736ae3b77deefa7.tar.gz
openembedded-core-982553b6d56ca4bfd095c1bcb736ae3b77deefa7.tar.bz2
openembedded-core-982553b6d56ca4bfd095c1bcb736ae3b77deefa7.zip
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>
Diffstat (limited to 'oe-init-build-env-memres')
-rwxr-xr-xoe-init-build-env-memres8
1 files changed, 4 insertions, 4 deletions
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index 00079989dc..9b9e0f44b0 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