Browse Source

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>
pyro-old
Peter Kjellerstedt 6 years ago
committed by Richard Purdie
parent
commit
dd5f2f7275
  1. 10
      oe-init-build-env
  2. 10
      oe-init-build-env-memres

10
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

10
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

Loading…
Cancel
Save