From ac0a2f8bff71ab2c8f6a8aa1023bbf19135c6e4a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 5 May 2017 15:51:41 +0300 Subject: 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 Signed-off-by: Richard Purdie --- .../packagegroups/packagegroup-core-lsb.bb | 26 ---------------------- 1 file changed, 26 deletions(-) (limited to 'meta/recipes-extended') 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 = "\ python-misc \ " -QT4PKGS = " \ - libqtcore4 \ - libqtgui4 \ - libqtsql4 \ - libqtsvg4 \ - libqtxml4 \ - libqtnetwork4 \ - qt4-plugin-sqldriver-sqlite \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ - " -QT4PKGS_mips64 = "" -QT4PKGS_mips64n32 = "" - -def get_libqt4(d): - if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) or "": - if 'qt4' in d.getVar('BBFILE_COLLECTIONS', False) or "": - return d.getVar('QT4PKGS', False) - - bb.warn('The meta-qt4 layer should be added, this layer provides Qt 4.x ' \ - 'libraries. Its intended use is for passing LSB tests as Qt4 is ' \ - 'a requirement for LSB.') - return '' -# We don't want this to rebuild every time you change your layer config -get_libqt4[vardepsexclude] += "BBFILE_COLLECTIONS" - SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ specified in the LSB Desktop specification" @@ -247,7 +222,6 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ gtk+ \ atk \ libasound \ - ${@get_libqt4(d)} \ " RDEPENDS_packagegroup-core-lsb-runtime-add = "\ -- cgit v1.2.3-54-g00ecf