[meta-qt5][PATCH 1/2] packagegroup-qt5-toolchain-target: do not check for meta-ruby layer

[meta-qt5][PATCH 1/2] packagegroup-qt5-toolchain-target: do not check for meta-ruby layer

[Jonathan Liu]

The ruby recipe has been moved into OE-core so checking for the
meta-ruby layer is no longer needed as the ruby recipe will always
be present.
---
 recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 30d0622..cc4d4b5 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -7,7 +7,7 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-# Requires meta-ruby to work
+# Requires Ruby to work
 USE_RUBY = " \
     qtquick1-dev \
     qtquick1-mkspecs \
@@ -95,7 +95,7 @@ RDEPENDS_${PN} += " \
     qttools-staticdev \
     qttools-tools \
     ${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \
-    ${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \
+    ${USE_RUBY} \
     ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
     qtwebsockets-dev \
     qtwebsockets-mkspecs \
-- 
2.6.4

[meta-qt5][PATCH 2/2] README: remove meta-ruby dependency

[Jonathan Liu]

The ruby recipe has been moved into OE-core so the meta-ruby layer
is no longer needed as the ruby recipe will always be present.

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 README | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README b/README
index dcfb5e5..9817851 100644
--- a/README
+++ b/README
@@ -4,11 +4,6 @@ URI: git://github.com/openembedded/oe-core.git
 branch: master
 revision: HEAD
 
-URI: git://github.com/openembedded/meta-oe.git
-layers: meta-ruby
-branch: master
-revision: HEAD
-
 When building stuff like qtdeclarative, qtquick, qtwebkit, make sure that
 you have required PACKAGECONFIG options enabled in qtbase build, see qtbase.inc
 for detail.
-- 
2.6.4