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>

2 files changed, 5 insertions, 1 deletions

diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml
index fce17e0..fbd5069 100644
--- a/scripts/manifest_qt5.xml
+++ b/scripts/manifest_qt5.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
-  <include name="manifest_dizzy.xml"/>
+  <include name="manifest.xml"/>
 
   <remote fetch="git://playground.ci.local" name="playground"/>
 
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
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
   cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
+  if [ ! -d ${PWD}/sources/meta-qt5 ]; then
+    sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
+  fi
+
   if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then
     QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../)
   fi