summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xb2qt-init-build-env4
-rwxr-xr-xscripts/setup-environment.sh4
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() {
120 mkdir -p .repo/manifests 120 mkdir -p .repo/manifests
121 cp ${DIR}/scripts/manifest.xml .repo/manifests/ 121 cp ${DIR}/scripts/manifest.xml .repo/manifests/
122 MANIFEST="manifest.xml" 122 MANIFEST="manifest.xml"
123 ${REPO} init -u .repo/repo -m ${MANIFEST} -g all --mirror 123 ${REPO} init -u .repo/repo -b default -m ${MANIFEST} -g all --mirror
124 ${REPO} sync 124 ${REPO} sync
125} 125}
126 126
@@ -139,7 +139,7 @@ init() {
139 else 139 else
140 MANIFEST="manifest.xml" 140 MANIFEST="manifest.xml"
141 fi 141 fi
142 ${REPO} init -u .repo/repo -m ${MANIFEST} -g "${GROUPS}" ${REFERENCE} 142 ${REPO} init -u .repo/repo -b default -m ${MANIFEST} -g "${GROUPS}" ${REFERENCE}
143 ${REPO} sync 143 ${REPO} sync
144 144
145 if [ ! -e "sources/meta-b2qt" ]; then 145 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
40 exit 1 40 exit 1
41fi 41fi
42 42
43BUILDDIR=${BUILDDIR:-build-${MACHINE}}
44
45if [ -z "$MACHINE" ]; then 43if [ -z "$MACHINE" ]; then
46 echo "Error: MACHINE environment variable not defined" 44 echo "Error: MACHINE environment variable not defined"
47 return 1 45 return 1
48fi 46fi
49 47
48BUILDDIR=${BUILDDIR:-build-${MACHINE}}
49
50if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then 50if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
51 case ${MACHINE} in 51 case ${MACHINE} in
52 apalis-imx6) 52 apalis-imx6)