summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-11-27 16:01:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:40:15 +0000
commit4fb3e0591e9981dc35a95d581685c68877b8f8b4 (patch)
treee5168dbb08324255a23653935d82dc517edcdec3 /meta
parent8b11ed8a75a15328bbd22d100a976cc669b84b58 (diff)
downloadpoky-4fb3e0591e9981dc35a95d581685c68877b8f8b4.tar.gz
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 <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb12
1 files changed, 11 insertions, 1 deletions
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 = " \
225QT4PKGS_mips64 = "" 225QT4PKGS_mips64 = ""
226QT4PKGS_mips64n32 = "" 226QT4PKGS_mips64n32 = ""
227 227
228def get_libqt4(d):
229 if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) or "":
230 if 'qt4' in d.getVar('BBFILE_COLLECTIONS', False) or "":
231 return d.getVar('QT4PKGS', False)
232
233 bb.warn('The meta-qt4 layer should be added, this layer provides Qt 4.x' \
234 'libraries. Its intended use is for passing LSB tests as Qt4 is' \
235 'a requirement for LSB.')
236 return ''
237
228SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" 238SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop"
229DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ 239DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \
230 specified in the LSB Desktop specification" 240 specified in the LSB Desktop specification"
@@ -245,7 +255,7 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\
245 gtk+ \ 255 gtk+ \
246 atk \ 256 atk \
247 libasound \ 257 libasound \
248 ${QT4PKGS} \ 258 ${@get_libqt4(d)} \
249 ${@get_libqt3(d)} \ 259 ${@get_libqt3(d)} \
250" 260"
251 261