From 2504e6b4cf074d8580043ced5bce844418e5fafd Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Fri, 9 Jan 2015 10:13:13 +0200
Subject: change BUILDDIR var since it's used by poky

BUILDDIR is exported by the poky env script, which caused problems
on our env script when setting up second build dir.

Change-Id: Ieeecff6ebfc5ac185de98870dc8c4305c882684f
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
---
 scripts/setup-environment.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 4fd881c..ad1405b 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -28,7 +28,7 @@ while test -n "$1"; do
       return 0
       ;;
     *)
-      BUILDDIR=$1
+      BUILDDIRECTORY=$1
     ;;
   esac
   shift
@@ -45,9 +45,9 @@ if [ -z "$MACHINE" ]; then
   return 1
 fi
 
-BUILDDIR=${BUILDDIR:-build-${MACHINE}}
+BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 
-if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
+if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
     apalis-imx6|colibri-vf)
       LAYERSCONF="bblayers.conf.toradex.sample"
@@ -76,8 +76,8 @@ if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
     ;;
   esac
 
-  mkdir -p ${PWD}/${BUILDDIR}/conf
-  cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIR}/conf/bblayers.conf
+  mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
+  cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
   if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then
     QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../)
@@ -85,11 +85,12 @@ if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
 fi
 
 export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf"
-. sources/poky/oe-init-build-env ${BUILDDIR}
+. sources/poky/oe-init-build-env ${BUILDDIRECTORY}
 
 # use sources from Qt SDK if that is available
 sed -i -e "/QT_SDK_PATH/s:\"\":\"${QT_SDK_PATH}\":" conf/local.conf
 
+unset BUILDDIRECTORY
 unset QT_SDK_PATH
 unset TEMPLATECONF
 unset LAYERSCONF
-- 
cgit v1.2.3-54-g00ecf