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>
This commit is contained in:
parent
ea28de6d39
commit
dd5f2f7275
|
@ -48,10 +48,14 @@ fi
|
||||||
unset THIS_SCRIPT
|
unset THIS_SCRIPT
|
||||||
|
|
||||||
export OEROOT
|
export OEROOT
|
||||||
. $OEROOT/scripts/oe-buildenv-internal && \
|
. $OEROOT/scripts/oe-buildenv-internal &&
|
||||||
TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
|
TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || {
|
||||||
[ -n "$BUILDDIR" ] && cd "$BUILDDIR"
|
|
||||||
unset OEROOT
|
unset OEROOT
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
unset OEROOT
|
||||||
|
|
||||||
|
[ -z "$BUILDDIR" ] || cd "$BUILDDIR"
|
||||||
|
|
||||||
# Shutdown any bitbake server if the BBSERVER variable is not set
|
# Shutdown any bitbake server if the BBSERVER variable is not set
|
||||||
if [ -z "$BBSERVER" ] && [ -f bitbake.lock ]; then
|
if [ -z "$BBSERVER" ] && [ -f bitbake.lock ]; then
|
||||||
|
|
|
@ -56,10 +56,14 @@ fi
|
||||||
unset THIS_SCRIPT
|
unset THIS_SCRIPT
|
||||||
|
|
||||||
export OEROOT
|
export OEROOT
|
||||||
. $OEROOT/scripts/oe-buildenv-internal && \
|
. $OEROOT/scripts/oe-buildenv-internal &&
|
||||||
TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
|
TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || {
|
||||||
[ -n "$BUILDDIR" ] && cd "$BUILDDIR"
|
|
||||||
unset OEROOT
|
unset OEROOT
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
unset OEROOT
|
||||||
|
|
||||||
|
[ -z "$BUILDDIR" ] || cd "$BUILDDIR"
|
||||||
|
|
||||||
res=1
|
res=1
|
||||||
if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then
|
if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then
|
||||||
|
|
Loading…
Reference in New Issue