diff options
| author |   Peter Kjellerstedt <pkj@axis.com> | 2016-03-15 16:04:11 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:30 +0000 |
| commit | ea28de6d39b4ff0db51a3f6ae1315aae7cb1260c (patch) | |
| tree | 4bc097fc3edd6155aa93114ec5f9896c4b5e3d3d /oe-init-build-env-memres | |
| parent | 51aa00f0f866687e43f1362d66796f61f5d52a79 (diff) | |
| download | openembedded-core-contrib-ea28de6d39b4ff0db51a3f6ae1315aae7cb1260c.tar.gz | |
oe-init-build-env*: Remove unnecessary differences between the scripts
While at it, also fix:
* consistent indentation (four spaces)
* unset temporary variables
* use $(...) instead of `...`
(From OE-Core rev: 1295d413f27941d0763a3d58982378738bf3ca06)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'oe-init-build-env-memres')
| -rwxr-xr-x | oe-init-build-env-memres | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres index 41c09d80d0..9d393f5812 100755 --- a/oe-init-build-env-memres +++ b/oe-init-build-env-memres @@ -41,12 +41,12 @@ else THIS_SCRIPT="$(pwd)/oe-init-build-env" fi if [ -n "$BBSERVER" ]; then - unset BBSERVER + unset BBSERVER fi -if [ -z "$ZSH_NAME" ] && [ "x$0" = "x$THIS_SCRIPT" ]; then - echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'" - exit 1 +if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then + echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'" + exit 1 fi if [ -z "$OEROOT" ]; then @@ -57,30 +57,30 @@ unset THIS_SCRIPT export OEROOT . $OEROOT/scripts/oe-buildenv-internal && \ - $OEROOT/scripts/oe-setup-builddir && \ - [ -n "$BUILDDIR" ] && cd $BUILDDIR + TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \ + [ -n "$BUILDDIR" ] && cd "$BUILDDIR" unset OEROOT res=1 -if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null ; then - BBSERVER=`cat bitbake.lock` bitbake --status-only +if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then + BBSERVER=$(cat bitbake.lock) bitbake --status-only res=$? fi -if [ $res != 0 ] ; then +if [ $res != 0 ]; then bitbake --server-only -t xmlrpc -B localhost:$port fi -if [ $port = -1 ] ; then +if [ $port = -1 ]; then export BBSERVER=localhost:-1 echo "Bitbake server started on demand as needed, use bitbake -m to shut it down" else - 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" + 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" + echo "Bitbake server started at: $BBSERVER, use bitbake -m to shut it down" fi - unset res fi +unset port res |