summaryrefslogtreecommitdiffstats
path: root/oe-init-build-env-memres
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2013-11-25 15:21:28 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-02 11:28:27 +0000
commit644a1a27eca40a3c563e65e975b9b48a98a20a24 (patch)
treec56f7162e5cf25fd256949f26c98dc29dcafccfe /oe-init-build-env-memres
parenta6b55d9d831fa0b5bf8ec2f6a6f988ee5addd242 (diff)
downloadpoky-644a1a27eca40a3c563e65e975b9b48a98a20a24.tar.gz
poky-644a1a27eca40a3c563e65e975b9b48a98a20a24.tar.bz2
poky-644a1a27eca40a3c563e65e975b9b48a98a20a24.zip
oe-init-build-env: Allow startup with and without memres
Use the bitbake --status-only and the fact that bitbake.lock will contain the host name and port to determine when to activate or shutdown the stay resident bitbake server. This allows a end developer to cleanly switch between the two ways to use bitbake as well as enter the memres bitbake server from multiple shells without starting the server if it is already running. (From OE-Core rev: d71059c86a8160f39af6ddfdd30c86835f4eb959) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'oe-init-build-env-memres')
-rwxr-xr-xoe-init-build-env-memres21
1 files changed, 18 insertions, 3 deletions
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index 79b91b751a..687d5e1225 100755
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -54,6 +54,21 @@ else
unset OEROOT
unset BBPATH
fi
-bitbake --server-only -t xmlrpc -B localhost:$port
-export BBSERVER=localhost:$port
-echo "Bitbake server started on port $port, use bitbake -m to shut it down"
+res=1
+if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null ; then
+ BBSERVER=`cat bitbake.lock` bitbake --status-only
+ res=$?
+fi
+
+if [ $res != 0 ] ; then
+ bitbake --server-only -t xmlrpc -B localhost:$port
+fi
+
+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"
+fi
+unset res