[oe-commits] Jason Wessel : oe-init-build-env: Allow startup with and without memres
git at git.openembedded.org
git at git.openembedded.org
Mon Dec 2 11:27:27 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: d71059c86a8160f39af6ddfdd30c86835f4eb959
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d71059c86a8160f39af6ddfdd30c86835f4eb959
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Mon Nov 25 15:21:28 2013 -0600
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.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
oe-init-build-env | 9 +++++++++
oe-init-build-env-memres | 21 ++++++++++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/oe-init-build-env b/oe-init-build-env
index de9692f..8ef32f3 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -47,3 +47,12 @@ else
unset BBPATH
fi
+# Shutdown any bitbake server if the BBSERVER variable is not set
+if [ -z "$BBSERVER" ] && [ -f bitbake.lock ] ; then
+ grep ":" bitbake.lock > /dev/null && BBSERVER=`cat bitbake.lock` bitbake --status-only
+ if [ $? = 0 ] ; then
+ echo "Shutting down bitbake memory resident server with bitbake -m"
+ BBSERVER=`cat bitbake.lock` bitbake -m
+ fi
+fi
+
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index 79b91b7..687d5e1 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
More information about the Openembedded-commits
mailing list