diff options
| -rwxr-xr-x | oe-init-build-env | 6 | ||||
| -rwxr-xr-x | scripts/oe-buildenv-internal | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/oe-init-build-env b/oe-init-build-env index 77332a7d6..cc30a3b19 100755 --- a/oe-init-build-env +++ b/oe-init-build-env @@ -35,10 +35,10 @@ else fi OEROOT=`readlink -f "$OEROOT"` export OEROOT - . $OEROOT/scripts/oe-buildenv-internal - $OEROOT/scripts/oe-setup-builddir + . $OEROOT/scripts/oe-buildenv-internal && \ + $OEROOT/scripts/oe-setup-builddir && \ + [ -n "$BUILDDIR" ] && cd $BUILDDIR unset OEROOT unset BBPATH - [ -n "$BUILDDIR" ] && cd $BUILDDIR fi diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index c13fc40f8..117b0c593 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -21,7 +21,7 @@ # It is assumed OEROOT is already defined when this is called if [ -z "$OEROOT" ]; then echo >&2 "Error: OEROOT is not defined!" - return + return 1 fi if [ "x$BDIR" = "x" ]; then @@ -29,6 +29,15 @@ if [ "x$BDIR" = "x" ]; then BDIR="build" else BDIR=`readlink -f "$1"` + if [ -z "$BDIR" ]; then + if expr "$1" : '.*/$' >/dev/null; then + echo >&2 "Error: please remove any trailing / in the argument." + else + PARENTDIR=`dirname "$1"` + echo >&2 "Error: the directory $PARENTDIR doesn't exist?" + fi + return 1 + fi fi fi if expr "$BDIR" : '/.*' > /dev/null ; then @@ -45,7 +54,7 @@ BUILDDIR=`readlink -f "$BUILDDIR"` if ! (test -d "$BITBAKEDIR"); then echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Please ensure a copy of bitbake exists at this location" - return + return 1 fi PATH="${OEROOT}/scripts:$BITBAKEDIR/bin/:$PATH" |