diff options
Diffstat (limited to 'oe-init-build-env')
-rwxr-xr-x | oe-init-build-env | 21 |
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 | |||
33 | THIS_SCRIPT="$(pwd)/oe-init-build-env" | 33 | THIS_SCRIPT="$(pwd)/oe-init-build-env" |
34 | fi | 34 | fi |
35 | if [ -n "$BBSERVER" ]; then | 35 | if [ -n "$BBSERVER" ]; then |
36 | unset BBSERVER | 36 | unset BBSERVER |
37 | fi | 37 | fi |
38 | 38 | ||
39 | if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then | 39 | if [ -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 |
42 | fi | 42 | fi |
43 | 43 | ||
44 | if [ -z "$OEROOT" ]; then | 44 | if [ -z "$OEROOT" ]; then |
@@ -49,16 +49,15 @@ unset THIS_SCRIPT | |||
49 | 49 | ||
50 | export OEROOT | 50 | export 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" |
54 | unset OEROOT | 54 | unset 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 |
57 | if [ -z "$BBSERVER" ] && [ -f bitbake.lock ] ; then | 57 | if [ -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 |
63 | fi | 63 | fi |
64 | |||