oe-init-build-env-memres: Add auto port functionality

In order to run multiple bitbake memory resident servers on the same
machine they must each use different ports.

This patch works in conjuction with bitbake to make the auto port
selection and lazy server startup the default.

(From OE-Core rev: 9cf1ac73c4e35101a4f5c01a5e1c53f9d567bc58)

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 16 insertions, 11 deletions

diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index 687d5e1225..00079989dc 100755
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -26,8 +26,8 @@
 # to sourcing this script.
 #
 if [ -z "$1" ]; then
-    echo "No port specified, using 12345"
-    port=12345
+    echo "No port specified, using dynamically selected port"
+    port=-1
 else
     port=$1
     shift
@@ -60,15 +60,20 @@ 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`
+    export BBSERVER=`cat bitbake.lock`
 
-if [ $res = 0 ] ; then
-    echo "Using existing bitbake server at: $BBSERVER, use bitbake -m to shut it down"
-else
-    echo "Bitbake server started at: $BBSERVER, use bitbake -m to shut it down"
+    if [ $res = 0 ] ; then
+        echo "Using existing bitbake server at: $BBSERVER, use bitbake -m to shut it down"
+    else
+        echo "Bitbake server started at: $BBSERVER, use bitbake -m to shut it down"
+    fi
+    unset res
 fi
-unset res