diff options
Diffstat (limited to 'oe-init-build-env-memres')
-rwxr-xr-x | oe-init-build-env-memres | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres index c1dc4fe3ef..092d4fe081 100755 --- a/oe-init-build-env-memres +++ b/oe-init-build-env-memres | |||
@@ -34,30 +34,32 @@ else | |||
34 | fi | 34 | fi |
35 | 35 | ||
36 | if [ -n "$BASH_SOURCE" ]; then | 36 | if [ -n "$BASH_SOURCE" ]; then |
37 | OEROOT="`dirname $BASH_SOURCE`" | 37 | THIS_SCRIPT=$BASH_SOURCE |
38 | elif [ -n "$ZSH_NAME" ]; then | 38 | elif [ -n "$ZSH_NAME" ]; then |
39 | OEROOT="`dirname $0`" | 39 | THIS_SCRIPT=$0 |
40 | else | 40 | else |
41 | OEROOT="`pwd`" | 41 | THIS_SCRIPT="$(pwd)/oe-init-build-env" |
42 | fi | 42 | fi |
43 | if [ -n "$BBSERVER" ]; then | 43 | if [ -n "$BBSERVER" ]; then |
44 | unset BBSERVER | 44 | unset BBSERVER |
45 | fi | 45 | fi |
46 | 46 | ||
47 | THIS_SCRIPT=$OEROOT/oe-init-build-env-memres | ||
48 | if [ -z "$ZSH_NAME" ] && [ "x$0" = "x$THIS_SCRIPT" ]; then | 47 | if [ -z "$ZSH_NAME" ] && [ "x$0" = "x$THIS_SCRIPT" ]; then |
49 | echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'" | 48 | echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'" |
50 | exit 1 | 49 | exit 1 |
51 | fi | 50 | fi |
52 | 51 | ||
53 | OEROOT=`readlink -f "$OEROOT"` | 52 | if [ -z "$OEROOT" ]; then |
53 | OEROOT=$(dirname "$THIS_SCRIPT") | ||
54 | OEROOT=$(readlink -f "$OEROOT") | ||
55 | fi | ||
56 | unset THIS_SCRIPT | ||
57 | |||
54 | export OEROOT | 58 | export OEROOT |
55 | . $OEROOT/scripts/oe-buildenv-internal && \ | 59 | . $OEROOT/scripts/oe-buildenv-internal && \ |
56 | $OEROOT/scripts/oe-setup-builddir && \ | 60 | $OEROOT/scripts/oe-setup-builddir && \ |
57 | [ -n "$BUILDDIR" ] && cd $BUILDDIR | 61 | [ -n "$BUILDDIR" ] && cd $BUILDDIR |
58 | unset OEROOT | 62 | unset OEROOT |
59 | unset BBPATH | ||
60 | unset THIS_SCRIPT | ||
61 | 63 | ||
62 | res=1 | 64 | res=1 |
63 | if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null ; then | 65 | if [ -e bitbake.lock ] && grep : bitbake.lock > /dev/null ; then |