summaryrefslogtreecommitdiffstats
path: root/b2qt-init-build-env
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-06-12 10:40:56 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-06-12 14:18:30 +0300
commit1bbd0fb4808f1ba64678c807d60717dc4127b993 (patch)
treed0d3c48048f19d1c7557f0526a5187ed4fdae48e /b2qt-init-build-env
parent5b366a1bbf220a0fb5774f30b0bcf9d9ac30d992 (diff)
downloadmeta-boot2qt-1bbd0fb4808f1ba64678c807d60717dc4127b993.tar.gz
Change how meta-qt5 repo is used with init script
The manifest.xml and manifest_dizzy.xml no longer checkouts the meta-qt5 repo, but the init script expects it to exists next to the meta-b2qt repo. This will then work with BYOS where both meta layer are available. For internal use, add manifest_qt5.xml, which checkouts the meta-qt5 repo from internal playground server. Change-Id: Id00f18de80ca11ee4813248bc2a84861df265b6f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'b2qt-init-build-env')
-rwxr-xr-xb2qt-init-build-env4
1 files changed, 4 insertions, 0 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 83776eb..2dfed01 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -153,6 +153,10 @@ init() {
153 ln -s ${DIR} sources/meta-b2qt 153 ln -s ${DIR} sources/meta-b2qt
154 fi 154 fi
155 155
156 if [ ! -e "sources/meta-qt5" ] && [ -e "${DIR}/../meta-qt5" ]; then
157 ln -s $(readlink -f ${DIR}/../meta-qt5) sources/meta-qt5
158 fi
159
156 cp ${DIR}/scripts/setup-environment.sh . 160 cp ${DIR}/scripts/setup-environment.sh .
157 161
158} 162}