From 4fb3e0591e9981dc35a95d581685c68877b8f8b4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 27 Nov 2015 16:01:45 +0200 Subject: packagegroup-core-lsb: treat qt4 packages same as qt3 packages This means issuing a warning about adding a separate layer if it is not configured. (From OE-Core rev: 81ddc453d09f23eca192171e93d5aa8878852388) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'meta/recipes-extended/packagegroups') diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index ce823858ce..be08c580eb 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -225,6 +225,16 @@ QT4PKGS = " \ 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 '' + SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ specified in the LSB Desktop specification" @@ -245,7 +255,7 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ gtk+ \ atk \ libasound \ - ${QT4PKGS} \ + ${@get_libqt4(d)} \ ${@get_libqt3(d)} \ " -- cgit 1.2.3-korg