summaryrefslogtreecommitdiffstats
path: root/oe-init-build-env
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2016-03-15 15:04:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:30 (GMT)
commitea28de6d39b4ff0db51a3f6ae1315aae7cb1260c (patch)
tree4bc097fc3edd6155aa93114ec5f9896c4b5e3d3d /oe-init-build-env
parent51aa00f0f866687e43f1362d66796f61f5d52a79 (diff)
downloadpoky-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')
-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 fa9eacd..0b4df1b 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -33,12 +33,12 @@ else
33 THIS_SCRIPT="$(pwd)/oe-init-build-env" 33 THIS_SCRIPT="$(pwd)/oe-init-build-env"
34fi 34fi
35if [ -n "$BBSERVER" ]; then 35if [ -n "$BBSERVER" ]; then
36 unset BBSERVER 36 unset BBSERVER
37fi 37fi
38 38
39if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then 39if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
40 echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'" 40 echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
41 exit 1 41 exit 1
42fi 42fi
43 43
44if [ -z "$OEROOT" ]; then 44if [ -z "$OEROOT" ]; then
@@ -49,16 +49,15 @@ unset THIS_SCRIPT
49 49
50export OEROOT 50export OEROOT
51. $OEROOT/scripts/oe-buildenv-internal && \ 51. $OEROOT/scripts/oe-buildenv-internal && \
52 TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \ 52 TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
53 [ -n "$BUILDDIR" ] && cd "$BUILDDIR" 53 [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
54unset OEROOT 54unset OEROOT
55 55
56# Shutdown any bitbake server if the BBSERVER variable is not set 56# Shutdown any bitbake server if the BBSERVER variable is not set
57if [ -z "$BBSERVER" ] && [ -f bitbake.lock ] ; then 57if [ -z "$BBSERVER" ] && [ -f bitbake.lock ]; then
58 grep ":" bitbake.lock > /dev/null && BBSERVER=`cat bitbake.lock` bitbake --status-only 58 grep ":" bitbake.lock > /dev/null && BBSERVER=$(cat bitbake.lock) bitbake --status-only
59 if [ $? = 0 ] ; then 59 if [ $? = 0 ]; then
60 echo "Shutting down bitbake memory resident server with bitbake -m" 60 echo "Shutting down bitbake memory resident server with bitbake -m"
61 BBSERVER=`cat bitbake.lock` bitbake -m 61 BBSERVER=$(cat bitbake.lock) bitbake -m
62 fi 62 fi
63fi 63fi
64