diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-05-05 15:51:41 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-28 15:52:17 +0100 |
commit | ac0a2f8bff71ab2c8f6a8aa1023bbf19135c6e4a (patch) | |
tree | 75bd3ebb8a617166b6a8e6f37d726b47efb377e8 /meta/recipes-extended/packagegroups | |
parent | 1fc2c9315faf65ea05fecf81450dd40b9a330435 (diff) | |
download | poky-ac0a2f8bff71ab2c8f6a8aa1023bbf19135c6e4a.tar.gz |
packagegroup-core-lsb: do not include Qt4 anymore
Last version of qt4 was released 2 years ago, and Qt4 was
officially EOLd at the end of 2015. On the other hand, LSB is no longer
being developed, and so will 'require' Qt4 until the end of time.
Let's pull the plug.
(From OE-Core rev: a9807738178529c76ea719af158cae1d8566b256)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/packagegroups')
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 224ff19819..61b35e6892 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | |||
@@ -202,31 +202,6 @@ RDEPENDS_packagegroup-core-lsb-python = "\ | |||
202 | python-misc \ | 202 | python-misc \ |
203 | " | 203 | " |
204 | 204 | ||
205 | QT4PKGS = " \ | ||
206 | libqtcore4 \ | ||
207 | libqtgui4 \ | ||
208 | libqtsql4 \ | ||
209 | libqtsvg4 \ | ||
210 | libqtxml4 \ | ||
211 | libqtnetwork4 \ | ||
212 | qt4-plugin-sqldriver-sqlite \ | ||
213 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ | ||
214 | " | ||
215 | QT4PKGS_mips64 = "" | ||
216 | QT4PKGS_mips64n32 = "" | ||
217 | |||
218 | def get_libqt4(d): | ||
219 | if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) or "": | ||
220 | if 'qt4' in d.getVar('BBFILE_COLLECTIONS', False) or "": | ||
221 | return d.getVar('QT4PKGS', False) | ||
222 | |||
223 | bb.warn('The meta-qt4 layer should be added, this layer provides Qt 4.x ' \ | ||
224 | 'libraries. Its intended use is for passing LSB tests as Qt4 is ' \ | ||
225 | 'a requirement for LSB.') | ||
226 | return '' | ||
227 | # We don't want this to rebuild every time you change your layer config | ||
228 | get_libqt4[vardepsexclude] += "BBFILE_COLLECTIONS" | ||
229 | |||
230 | SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" | 205 | SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" |
231 | DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ | 206 | DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ |
232 | specified in the LSB Desktop specification" | 207 | specified in the LSB Desktop specification" |
@@ -247,7 +222,6 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ | |||
247 | gtk+ \ | 222 | gtk+ \ |
248 | atk \ | 223 | atk \ |
249 | libasound \ | 224 | libasound \ |
250 | ${@get_libqt4(d)} \ | ||
251 | " | 225 | " |
252 | 226 | ||
253 | RDEPENDS_packagegroup-core-lsb-runtime-add = "\ | 227 | RDEPENDS_packagegroup-core-lsb-runtime-add = "\ |