summaryrefslogtreecommitdiffstats
path: root/oe-init-build-env
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2016-03-15 14:41:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:30 (GMT)
commit16fb9b80e3887b053cb980317d4f28228348f689 (patch)
treed882340534a7b83147008d2f2dd4688648a391c6 /oe-init-build-env
parent3173979532aa57fe39479df819884430adb47b63 (diff)
downloadpoky-16fb9b80e3887b053cb980317d4f28228348f689.tar.gz
oe-init-build-env*: Allow $OEROOT to be predefined
The current implementation of oe-init-build-env and oe-init-build-env-memres requires that they are sourced from the directory that will be known as $OEROOT. This makes it hard to write a wrapper script with the same name as the original OE script which, e.g., sources the original OE script from a sub-directory. With this change, $OEROOT can be predefined when oe-init-build-env or oe-init-build-env-memres is sourced, allowing the original OE scripts to be anywhere. (From OE-Core rev: 3327e2a9222004d8ac7974cb1d9fe77c81176cfc) 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')
-rwxr-xr-xoe-init-build-env16
1 files changed, 9 insertions, 7 deletions
diff --git a/oe-init-build-env b/oe-init-build-env
index b7e2918..7b922b3 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -26,30 +26,32 @@
26# to sourcing this script. 26# to sourcing this script.
27# 27#
28if [ -n "$BASH_SOURCE" ]; then 28if [ -n "$BASH_SOURCE" ]; then
29 OEROOT="`dirname $BASH_SOURCE`" 29 THIS_SCRIPT=$BASH_SOURCE
30elif [ -n "$ZSH_NAME" ]; then 30elif [ -n "$ZSH_NAME" ]; then
31 OEROOT="`dirname $0`" 31 THIS_SCRIPT=$0
32else 32else
33 OEROOT="`pwd`" 33 THIS_SCRIPT="$(pwd)/oe-init-build-env"
34fi 34fi
35if [ -n "$BBSERVER" ]; then 35if [ -n "$BBSERVER" ]; then
36 unset BBSERVER 36 unset BBSERVER
37fi 37fi
38THIS_SCRIPT=$OEROOT/oe-init-build-env
39 38
40if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then 39if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
41 echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'" 40 echo "Error: This script needs to be sourced. Please run as '. $THIS_SCRIPT'"
42 exit 1 41 exit 1
43fi 42fi
44 43
45OEROOT=`readlink -f "$OEROOT"` 44if [ -z "$OEROOT" ]; then
45 OEROOT=$(dirname "$THIS_SCRIPT")
46 OEROOT=$(readlink -f "$OEROOT")
47fi
48unset THIS_SCRIPT
49
46export OEROOT 50export OEROOT
47. $OEROOT/scripts/oe-buildenv-internal && \ 51. $OEROOT/scripts/oe-buildenv-internal && \
48 TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \ 52 TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
49 [ -n "$BUILDDIR" ] && cd "$BUILDDIR" 53 [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
50unset OEROOT 54unset OEROOT
51unset BBPATH
52unset THIS_SCRIPT
53 55
54# Shutdown any bitbake server if the BBSERVER variable is not set 56# Shutdown any bitbake server if the BBSERVER variable is not set
55if [ -z "$BBSERVER" ] && [ -f bitbake.lock ] ; then 57if [ -z "$BBSERVER" ] && [ -f bitbake.lock ] ; then