summaryrefslogtreecommitdiffstats
path: root/scripts/setup-environment.sh
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-06-15 09:34:12 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-06-15 15:34:34 +0300
commit455e002444b5c293fbdc4e6ba2a20d7c26d0e995 (patch)
tree9d98412778bf7dc22eddd6f45af3382561df9392 /scripts/setup-environment.sh
parent3962b0d28716af53e6d0343f85bccaec22187d2c (diff)
downloadmeta-boot2qt-455e002444b5c293fbdc4e6ba2a20d7c26d0e995.tar.gz
Handle missing meta-qt5 layer
If meta-qt5 layer is not available, remove it from bblayer.conf as well. When using --device qt5, use the pinned revisions of other meta layer repos. Change-Id: I42f12d9725f3871a49b81b711b5f97037c4febd0 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'scripts/setup-environment.sh')
-rwxr-xr-xscripts/setup-environment.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 26c374d..686a65c 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -79,6 +79,10 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
79 mkdir -p ${PWD}/${BUILDDIRECTORY}/conf 79 mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
80 cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf 80 cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
81 81
82 if [ ! -d ${PWD}/sources/meta-qt5 ]; then
83 sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
84 fi
85
82 if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then 86 if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then
83 QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../) 87 QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../)
84 fi 88 fi