diff options
| author |   Peter Kjellerstedt <pkj@axis.com> | 2016-03-17 10:56:28 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:30 +0000 |
| commit | dd5f2f7275a2f36e9dd8979fbdf1e367ad579147 (patch) | |
| tree | 0b92377d17e95bdd0889136b2ae512eb350fdf76 /oe-init-build-env | |
| parent | ea28de6d39b4ff0db51a3f6ae1315aae7cb1260c (diff) | |
| download | openembedded-core-contrib-dd5f2f7275a2f36e9dd8979fbdf1e367ad579147.tar.gz | |
oe-init-build-env*: Make them actually return failures
If either of the internal scripts (oe-buildenv-internal and
oe-setup-builddir) failed, oe-init-build-env (and
oe-init-build-env-memres) would still return success.
(From OE-Core rev: 40764c7039f1ee161916d4fbf7dfe15fb964030e)
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-x | oe-init-build-env | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/oe-init-build-env b/oe-init-build-env index 0b4df1b2dcb..5fe68d1e2a3 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 |