summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-10-20 10:23:15 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-10-25 05:36:38 +0000
commit1a85179a6d05985afc7c916e666866cfa6aa32af (patch)
tree84a2e9aabd3004da00ae272fd671542d7b1dc3b3
parentab693fb13c88b7134733455c5cb1706813e44e3d (diff)
downloadmeta-boot2qt-1a85179a6d05985afc7c916e666866cfa6aa32af.tar.gz
Improve repo fetching
Add support for --device and --internal to the mirror creation. Use --optimized-fetch when initializing build env, since the internal repos in gitlab sometimes fail to be fetched, which breaks CI builds. --optimized-fetch pulls from network only if the SHA1 is not found from local repos or from mirror. Change-Id: I427aa7a652bdb63be8f6db8682a9af00c2468ab8 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Risto Avila <risto.avila@qt.io>
-rwxr-xr-xb2qt-init-build-env6
1 files changed, 4 insertions, 2 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index c9c5f46..184af7d 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -151,7 +151,9 @@ mirror() {
151 mkdir -p .repo/manifests 151 mkdir -p .repo/manifests
152 cp ${DIR}/scripts/manifest.xml .repo/manifests/ 152 cp ${DIR}/scripts/manifest.xml .repo/manifests/
153 MANIFEST="manifest.xml" 153 MANIFEST="manifest.xml"
154 ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror 154 DEVICE=${DEVICE:-all}
155 get_groups
156 ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" --mirror
155 ${REPO} sync 157 ${REPO} sync
156} 158}
157 159
@@ -172,7 +174,7 @@ init() {
172 MANIFEST="manifest.xml" 174 MANIFEST="manifest.xml"
173 fi 175 fi
174 ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE} 176 ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
175 ${REPO} sync 177 ${REPO} sync --optimized-fetch
176 178
177 if [ ! -e "sources/meta-boot2qt" ]; then 179 if [ ! -e "sources/meta-boot2qt" ]; then
178 ln -s ${DIR} sources/meta-boot2qt 180 ln -s ${DIR} sources/meta-boot2qt