Fixes for setup scripts

Change-Id: Ib506ebd57e0943cbbd2b4dfcb6291a3938807c1f
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 0fa07ba..3265297 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -120,7 +120,7 @@ mirror() {
   mkdir -p .repo/manifests
   cp ${DIR}/scripts/manifest.xml .repo/manifests/
   MANIFEST="manifest.xml"
-  ${REPO} init -u .repo/repo -m ${MANIFEST} -g all --mirror
+  ${REPO} init -u .repo/repo -b default -m ${MANIFEST} -g all --mirror
   ${REPO} sync
 }
 
@@ -139,7 +139,7 @@ init() {
   else
     MANIFEST="manifest.xml"
   fi
-  ${REPO} init -u .repo/repo -m ${MANIFEST} -g "${GROUPS}" ${REFERENCE}
+  ${REPO} init -u .repo/repo -b default -m ${MANIFEST} -g "${GROUPS}" ${REFERENCE}
   ${REPO} sync
 
   if [ ! -e "sources/meta-b2qt" ]; then
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 2ff9e29..92e75aa 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -40,13 +40,13 @@ if [ "$(basename $0)" = "${THIS_SCRIPT}" ]; then
     exit 1
 fi
 
-BUILDDIR=${BUILDDIR:-build-${MACHINE}}
-
 if [ -z "$MACHINE" ]; then
   echo "Error: MACHINE environment variable not defined"
   return 1
 fi
 
+BUILDDIR=${BUILDDIR:-build-${MACHINE}}
+
 if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
   case ${MACHINE} in
     apalis-imx6)