summaryrefslogtreecommitdiffstats
path: root/oe-init-build-env-memres
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2016-03-17 09:56:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:30 (GMT)
commitdd5f2f7275a2f36e9dd8979fbdf1e367ad579147 (patch)
tree0b92377d17e95bdd0889136b2ae512eb350fdf76 /oe-init-build-env-memres
parentea28de6d39b4ff0db51a3f6ae1315aae7cb1260c (diff)
downloadpoky-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-memres')
-rwxr-xr-xoe-init-build-env-memres10
1 files changed, 7 insertions, 3 deletions
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index 9d393f5..9e1425e 100755
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -56,11 +56,15 @@ fi
56unset THIS_SCRIPT 56unset THIS_SCRIPT
57 57
58export OEROOT 58export OEROOT
59. $OEROOT/scripts/oe-buildenv-internal && \ 59. $OEROOT/scripts/oe-buildenv-internal &&
60 TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \ 60 TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || {
61 [ -n "$BUILDDIR" ] && cd "$BUILDDIR" 61 unset OEROOT
62 return 1
63}
62unset OEROOT 64unset OEROOT
63 65
66[ -z "$BUILDDIR" ] || cd "$BUILDDIR"
67
64res=1 68res=1
65if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then 69if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null; then
66 BBSERVER=$(cat bitbake.lock) bitbake --status-only 70 BBSERVER=$(cat bitbake.lock) bitbake --status-only