diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-29 22:49:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-30 10:10:34 +0100 |
commit | 42d0824067ff88b0287003e945255108e742cffd (patch) | |
tree | 409adca0e6bb326e07fed865a2d695fb4e8c7452 /meta/recipes-extended | |
parent | 0bc2d874895336b9bf49e4339577b87cccccf64e (diff) | |
download | poky-42d0824067ff88b0287003e945255108e742cffd.tar.gz |
packagegroup-core-lsb: Limit mips64 issues to qt4 packages only
The COMPATIBLE_HOST setting was only there for mips64 issues. Move that
restriction to the qt4 packages themselves so the rest of the lsb images can
be built.
(From OE-Core rev: ef7968dbded62cfce91e4f44bc96e8d04b076f15)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 68070e4f02..914a7a9b7e 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | |||
@@ -7,8 +7,6 @@ DESCRIPTION = "Packages required to satisfy the Linux Standard Base (LSB) specif | |||
7 | PR = "r10" | 7 | PR = "r10" |
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | 9 | ||
10 | COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" | ||
11 | |||
12 | inherit packagegroup | 10 | inherit packagegroup |
13 | 11 | ||
14 | PACKAGES = "\ | 12 | PACKAGES = "\ |
@@ -203,23 +201,28 @@ def get_libqt3(d): | |||
203 | bb.warn('a requirement for LSB') | 201 | bb.warn('a requirement for LSB') |
204 | return '' | 202 | return '' |
205 | 203 | ||
206 | SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" | 204 | QT4PKGS = " \ |
207 | DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ | ||
208 | specified in the LSB Desktop specification" | ||
209 | RDEPENDS_packagegroup-core-lsb-desktop = "\ | ||
210 | libqtcore4 \ | 205 | libqtcore4 \ |
211 | libqtgui4 \ | 206 | libqtgui4 \ |
212 | libqtsql4 \ | 207 | libqtsql4 \ |
213 | libqtsvg4 \ | 208 | libqtsvg4 \ |
214 | libqtxml4 \ | 209 | libqtxml4 \ |
215 | libqtnetwork4 \ | 210 | libqtnetwork4 \ |
211 | qt4-plugin-sqldriver-sqlite \ | ||
212 | ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ | ||
213 | " | ||
214 | QT4PKGS_mips64 = "" | ||
215 | |||
216 | SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" | ||
217 | DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ | ||
218 | specified in the LSB Desktop specification" | ||
219 | RDEPENDS_packagegroup-core-lsb-desktop = "\ | ||
216 | libxt \ | 220 | libxt \ |
217 | libxxf86vm \ | 221 | libxxf86vm \ |
218 | libdrm \ | 222 | libdrm \ |
219 | libglu \ | 223 | libglu \ |
220 | libxi \ | 224 | libxi \ |
221 | libxtst \ | 225 | libxtst \ |
222 | qt4-plugin-sqldriver-sqlite \ | ||
223 | libx11-locale \ | 226 | libx11-locale \ |
224 | xorg-minimal-fonts \ | 227 | xorg-minimal-fonts \ |
225 | gdk-pixbuf-loader-ico \ | 228 | gdk-pixbuf-loader-ico \ |
@@ -230,7 +233,7 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ | |||
230 | gtk+ \ | 233 | gtk+ \ |
231 | atk \ | 234 | atk \ |
232 | libasound \ | 235 | libasound \ |
233 | ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ | 236 | ${QT4PKGS} \ |
234 | ${@get_libqt3(d)} \ | 237 | ${@get_libqt3(d)} \ |
235 | " | 238 | " |
236 | 239 | ||