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>

4 files changed, 19 insertions, 14 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() {
     ln -s ${DIR} sources/meta-b2qt
   fi
 
+  if [ ! -e "sources/meta-qt5" ]  && [ -e "${DIR}/../meta-qt5" ]; then
+    ln -s $(readlink -f ${DIR}/../meta-qt5) sources/meta-qt5
+  fi
+
   cp ${DIR}/scripts/setup-environment.sh .
 
 }
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 2a39879..4a88a1b 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
-  <default sync-j="4" revision="daisy"/>
+  <default sync-j="4" revision="dizzy"/>
 
   <remote fetch="git://git.yoctoproject.org" name="yocto"/>
   <remote fetch="git://git.openembedded.org" name="oe"/>
   <remote fetch="git://github.com/Freescale" name="freescale"/>
   <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
-  <remote fetch="git://github.com/meta-qt5" name="qt5"/>
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
-  <remote fetch="ssh://qt-gerrit.ci.local/QtRD-15810" name="gerrit"/>
 
   <project name="poky"
            remote="yocto"
@@ -20,10 +18,6 @@
            remote="oe"
            revision="5b6f39ce325d490fc382d5d59c5b8b9d5fa38b38"
            path="sources/meta-openembedded"/>
-  <project name="qt5-yocto-meta"
-           remote="gerrit"
-           revision="b2qt"
-           path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml
index 956ff74..d6fdd0b 100644
--- a/scripts/manifest_dizzy.xml
+++ b/scripts/manifest_dizzy.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
-  <default sync-j="4" revision="daisy"/>
+  <default sync-j="4" revision="dizzy"/>
 
   <remote fetch="git://git.yoctoproject.org" name="yocto"/>
   <remote fetch="git://git.openembedded.org" name="oe"/>
   <remote fetch="git://github.com/Freescale" name="freescale"/>
   <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
-  <remote fetch="git://github.com/meta-qt5" name="qt5"/>
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
-  <remote fetch="ssh://qt-gerrit.ci.local/QtRD-15810" name="gerrit"/>
 
   <project name="poky"
            remote="yocto"
@@ -20,10 +18,6 @@
            remote="oe"
            revision="dizzy"
            path="sources/meta-openembedded"/>
-  <project name="qt5-yocto-meta"
-           remote="gerrit"
-           revision="b2qt"
-           path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml
new file mode 100644
index 0000000..fce17e0
--- /dev/null
+++ b/scripts/manifest_qt5.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <include name="manifest_dizzy.xml"/>
+
+  <remote fetch="git://playground.ci.local" name="playground"/>
+
+  <project name="meta-qt5"
+           remote="playground"
+           revision="5.4"
+           path="sources/meta-qt5"/>
+
+</manifest>