diff options
| author | Jonathan Liu <net147@gmail.com> | 2015-12-15 20:44:28 +1100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-18 13:12:04 +0100 |
| commit | 82b8dc3a17ed62a2d4c299303cf2bc2468127cc3 (patch) | |
| tree | 6bc1961c65ad312d3dadf463bc8ee60fd788ae7e | |
| parent | c6e7096715a869e880610efa8fef073ed4ab3684 (diff) | |
| download | meta-qt5-82b8dc3a17ed62a2d4c299303cf2bc2468127cc3.tar.gz | |
packagegroup-qt5-toolchain-target: do not check for meta-ruby layer
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.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 4 |
1 files 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 30d06222..cc4d4b5f 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 | |||
| 7 | 7 | ||
| 8 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" | 8 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" |
| 9 | 9 | ||
| 10 | # Requires meta-ruby to work | 10 | # Requires Ruby to work |
| 11 | USE_RUBY = " \ | 11 | USE_RUBY = " \ |
| 12 | qtquick1-dev \ | 12 | qtquick1-dev \ |
| 13 | qtquick1-mkspecs \ | 13 | qtquick1-mkspecs \ |
| @@ -95,7 +95,7 @@ RDEPENDS_${PN} += " \ | |||
| 95 | qttools-staticdev \ | 95 | qttools-staticdev \ |
| 96 | qttools-tools \ | 96 | qttools-tools \ |
| 97 | ${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ | 97 | ${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ |
| 98 | ${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \ | 98 | ${USE_RUBY} \ |
| 99 | ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ | 99 | ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ |
| 100 | qtwebsockets-dev \ | 100 | qtwebsockets-dev \ |
| 101 | qtwebsockets-mkspecs \ | 101 | qtwebsockets-mkspecs \ |
