summaryrefslogtreecommitdiffstats
path: root/oe-init-build-env-memres
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-23 14:56:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-23 19:06:06 (GMT)
commit177af6e831dc9292c7d5e02f81c3e13e8af926fd (patch)
tree0f93c98ae1b37a7f194a679b1d52b636ac11b017 /oe-init-build-env-memres
parentb65e3e26cb9ead70579022f6949c9b2ff0fee75d (diff)
downloadpoky-177af6e831dc9292c7d5e02f81c3e13e8af926fd.tar.gz
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] (From OE-Core rev: 982553b6d56ca4bfd095c1bcb736ae3b77deefa7) 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 0007998..9b9e0f4 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
60 res=$? 60 res=$?
61fi 61fi
62 62
63if [ $res != 0 ] ; then
64 bitbake --server-only -t xmlrpc -B localhost:$port
65fi
66
63if [ $port = -1 ] ; then 67if [ $port = -1 ] ; then
64 export BBSERVER=localhost:-1 68 export BBSERVER=localhost:-1
65 echo "Bitbake server started on demand as needed, use bitbake -m to shut it down" 69 echo "Bitbake server started on demand as needed, use bitbake -m to shut it down"
66else 70else
67 if [ $res != 0 ] ; then
68 bitbake --server-only -t xmlrpc -B localhost:$port
69 fi
70
71 export BBSERVER=`cat bitbake.lock` 71 export BBSERVER=`cat bitbake.lock`
72 72
73 if [ $res = 0 ] ; then 73 if [ $res = 0 ] ; then