aboutsummaryrefslogtreecommitdiffstats
path: root/oe-init-build-env
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2016-03-15 16:04:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 22:57:58 +0000
commit1295d413f27941d0763a3d58982378738bf3ca06 (patch)
tree1a0a975c77ded886d5cfdddb640d6e67afc69075 /oe-init-build-env
parent9c7e3cfcff08bd47b0c1eeb63d8055d8a8b12935 (diff)
downloadopenembedded-core-1295d413f27941d0763a3d58982378738bf3ca06.tar.gz
openembedded-core-1295d413f27941d0763a3d58982378738bf3ca06.tar.bz2
openembedded-core-1295d413f27941d0763a3d58982378738bf3ca06.zip
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 `...` Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'oe-init-build-env')
-rwxr-xr-xoe-init-build-env21
1 files changed, 10 insertions, 11 deletions
diff --git a/oe-init-build-env b/oe-init-build-env
index fa9eacd890..0b4df1b2dc 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -33,12 +33,12 @@ else
THIS_SCRIPT="$(pwd)/oe-init-build-env"
fi
if [ -n "$BBSERVER" ]; then
- unset BBSERVER
+ unset BBSERVER
fi
if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
- echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
- exit 1
+ echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
+ exit 1
fi
if [ -z "$OEROOT" ]; then
@@ -49,16 +49,15 @@ unset THIS_SCRIPT
export OEROOT
. $OEROOT/scripts/oe-buildenv-internal && \
- TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
- [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
+ TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
+ [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
unset OEROOT
# 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
+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
-