From 13db86c927bbaec61a889032cbdcb75bd29f085b Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Mon, 16 Mar 2015 10:22:56 +0200
Subject: Use meta-qt5 layer

Include the open source meta-qt5 layer to all configs.
The revision in manifest.xml is the HEAD of master at
the time of commit.

Change-Id: I3b960750cf0bfcd19c200322d6c6605185a195e7
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
---
 conf/bblayers.conf.bbb.sample      | 2 ++
 conf/bblayers.conf.emulator.sample | 2 ++
 conf/bblayers.conf.fsl.sample      | 2 ++
 conf/bblayers.conf.rpi.sample      | 2 ++
 conf/bblayers.conf.sample          | 2 ++
 conf/bblayers.conf.ti.sample       | 2 ++
 conf/bblayers.conf.tibidabo.sample | 1 +
 conf/bblayers.conf.toradex.sample  | 2 ++
 scripts/manifest.xml               | 5 +++++
 scripts/manifest_dizzy.xml         | 6 ++++++
 10 files changed, 26 insertions(+)

diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index f7374a0..d4ffbc4 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -34,6 +34,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-beagleboard/common-bsp \
   ${BSPDIR}/sources/meta-ti \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index c961b9f..43ce7d3 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -32,6 +32,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-yocto \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index c867cda..dd84362 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -34,6 +34,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-fsl-arm \
   ${BSPDIR}/sources/meta-fsl-arm-extra \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
   "
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index adc0e68..0866e3e 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -33,6 +33,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta-yocto \
   ${BSPDIR}/sources/meta-raspberrypi \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \
   "
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index d01c12a..f306303 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -38,6 +38,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-raspberrypi \
   ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index df762a1..7fc2d6b 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -33,6 +33,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta-yocto \
   ${BSPDIR}/sources/meta-ti \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
   "
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index c12cde1..734f66a 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -34,6 +34,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-fsl-arm \
   ${BSPDIR}/sources/meta-tibidabo \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-qt5 \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index 00c64f7..c724636 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -35,6 +35,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-fsl-arm-extra \
   ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
   ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 694a7a5..db439f1 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -7,6 +7,7 @@
   <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"/>
 
   <project name="poky"
@@ -17,6 +18,10 @@
            remote="oe"
            revision="6413cdb66acf43059f94d0076ec9b8ad6a475b35"
            path="sources/meta-openembedded"/>
+  <project name="meta-qt5"
+           remote="qt5"
+           revision="22c431e7a1fa525c75bf1fa48c82d01955001350"
+           path="sources/meta-qt5"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml
index d4eccc0..83dca5f 100644
--- a/scripts/manifest_dizzy.xml
+++ b/scripts/manifest_dizzy.xml
@@ -7,7 +7,9 @@
   <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="ssh://qt-gerrit.it.local/QtRD-15810" name="gerrit"/>
 
   <project name="poky"
            remote="yocto"
@@ -17,6 +19,10 @@
            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"
-- 
cgit v1.2.3-54-g00ecf