diff options
| -rwxr-xr-x | oe-init-build-env | 10 | ||||
| -rwxr-xr-x | oe-init-build-env-memres | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/oe-init-build-env b/oe-init-build-env index 0b4df1b2dc..5fe68d1e2a 100755 --- a/oe-init-build-env +++ b/oe-init-build-env @@ -48,11 +48,15 @@ fi unset THIS_SCRIPT export OEROOT -. $OEROOT/scripts/oe-buildenv-internal && \ - TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \ - [ -n "$BUILDDIR" ] && cd "$BUILDDIR" +. $OEROOT/scripts/oe-buildenv-internal && + TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || { + unset OEROOT + return 1 +} unset OEROOT +[ -z "$BUILDDIR" ] || cd "$BUILDDIR" + # 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 diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres index 9d393f5812..9e1425ea83 100755 --- a/oe-init-build-env-memres +++ b/oe-init-build-env-memres @@ -56,11 +56,15 @@ fi unset THIS_SCRIPT export OEROOT -. $OEROOT/scripts/oe-buildenv-internal && \ - TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \ - [ -n "$BUILDDIR" ] && cd "$BUILDDIR" +. $OEROOT/scripts/oe-buildenv-internal && + TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || { + unset OEROOT + return 1 +} unset OEROOT +[ -z "$BUILDDIR" ] || cd "$BUILDDIR" + res=1 if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then BBSERVER=$(cat bitbake.lock) bitbake --status-only |