From 982553b6d56ca4bfd095c1bcb736ae3b77deefa7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 23 Sep 2014 15:56:31 +0100 Subject: 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 --- oe-init-build-env-memres | 8 ++++---- 1 file 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 -- cgit 1.2.3-korg