diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-11-27 15:48:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-07 13:40:14 +0000 |
commit | 8b11ed8a75a15328bbd22d100a976cc669b84b58 (patch) | |
tree | 9b93d0fcd8fd973943ca61f126cae47066113922 /meta/conf/distro/include | |
parent | 0baadc8a98daa14090b04e728fb5a44af3f545c8 (diff) | |
download | poky-8b11ed8a75a15328bbd22d100a976cc669b84b58.tar.gz |
qt4: remove recipes and classes
Qt4 is no longer supportd upstream, but it is still needed for LSB compliancy.
Qt4 recipes have been moved to a separate meta-qt4 layer to be consistent with
meta-qt3 and meta-qt5.
(From OE-Core rev: cb89d2b25b4edb1241bc5426a69a6bc44df9be2c)
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/conf/distro/include')
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/distro_alias.inc | 20 |
2 files changed, 0 insertions, 22 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 8866f0d2f8..0c6d018365 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc | |||
@@ -31,8 +31,6 @@ COMMERCIAL_AUDIO_PLUGINS ?= "" | |||
31 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" | 31 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" |
32 | COMMERCIAL_VIDEO_PLUGINS ?= "" | 32 | COMMERCIAL_VIDEO_PLUGINS ?= "" |
33 | # COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" | 33 | # COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" |
34 | COMMERCIAL_QT ?= "" | ||
35 | # COMMERCIAL_QT ?= "qmmp" | ||
36 | # Set of common licenses used for license.bbclass | 34 | # Set of common licenses used for license.bbclass |
37 | COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" | 35 | COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" |
38 | 36 | ||
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index dfce7605d1..530917760a 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
@@ -52,7 +52,6 @@ DISTRO_PN_ALIAS_pn-core-image-full-cmdline = "OE-Core" | |||
52 | DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core" | 52 | DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core" |
53 | DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core" | 53 | DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core" |
54 | DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core" | 54 | DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core" |
55 | DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = "OE-Core" | ||
56 | DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core" | 55 | DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core" |
57 | DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" | 56 | DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" |
58 | DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core" | 57 | DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core" |
@@ -102,7 +101,6 @@ DISTRO_PN_ALIAS_pn-fontcacheproto = "Meego=xorg-x11-proto-fontcacheproto" | |||
102 | DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto" | 101 | DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto" |
103 | DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" | 102 | DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" |
104 | DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" | 103 | DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" |
105 | DISTRO_PN_ALIAS_pn-fotowall = "Fedora=fotowall Ubuntu=fotowall" | ||
106 | DISTRO_PN_ALIAS_pn-fstests = "OpenedHand" | 104 | DISTRO_PN_ALIAS_pn-fstests = "OpenedHand" |
107 | DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core" | 105 | DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core" |
108 | DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core" | 106 | DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core" |
@@ -261,8 +259,6 @@ DISTRO_PN_ALIAS_pn-meta-environment-qemux86 = "OE-Core" | |||
261 | DISTRO_PN_ALIAS_pn-meta-environment-qemux86-64 = "OE-Core" | 259 | DISTRO_PN_ALIAS_pn-meta-environment-qemux86-64 = "OE-Core" |
262 | DISTRO_PN_ALIAS_pn-meta-ide-support = "OE-Core" | 260 | DISTRO_PN_ALIAS_pn-meta-ide-support = "OE-Core" |
263 | DISTRO_PN_ALIAS_pn-meta-toolchain = "OE-Core" | 261 | DISTRO_PN_ALIAS_pn-meta-toolchain = "OE-Core" |
264 | DISTRO_PN_ALIAS_pn-meta-toolchain-qt = "OE-Core" | ||
265 | DISTRO_PN_ALIAS_pn-meta-toolchain-qte = "OE-Core" | ||
266 | DISTRO_PN_ALIAS_pn-mini-x-session = "OSPDT" | 262 | DISTRO_PN_ALIAS_pn-mini-x-session = "OSPDT" |
267 | DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage" | 263 | DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage" |
268 | DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" | 264 | DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" |
@@ -301,8 +297,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-core-eclipse-debug = "OE-Core" | |||
301 | DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core" | 297 | DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core" |
302 | DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core" | 298 | DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core" |
303 | DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core" | 299 | DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core" |
304 | DISTRO_PN_ALIAS_pn-packagegroup-core-qt = "OE-Core" | ||
305 | DISTRO_PN_ALIAS_pn-packagegroup-core-qt4e = "OE-Core" | ||
306 | DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core" | 300 | DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core" |
307 | DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core" | 301 | DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core" |
308 | DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-openssh = "OE-Core" | 302 | DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-openssh = "OE-Core" |
@@ -319,11 +313,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-core-x11-xserver = "OE-Core" | |||
319 | DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-i586 = "OE-Core" | 313 | DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-i586 = "OE-Core" |
320 | DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86 = "OE-Core" | 314 | DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86 = "OE-Core" |
321 | DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86-64 = "OE-Core" | 315 | DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86-64 = "OE-Core" |
322 | DISTRO_PN_ALIAS_pn-packagegroup-qt4e = "OE-Core" | ||
323 | DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-host = "OE-Core" | ||
324 | DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-target = "Intel" | ||
325 | DISTRO_PN_ALIAS_pn-packagegroup-qt-toolchain-host = "OE-Core" | ||
326 | DISTRO_PN_ALIAS_pn-packagegroup-qt-toolchain-target = "OE-Core" | ||
327 | DISTRO_PN_ALIAS_pn-packagegroup-sdk-host = "OE-Core" | 316 | DISTRO_PN_ALIAS_pn-packagegroup-sdk-host = "OE-Core" |
328 | DISTRO_PN_ALIAS_pn-packagegroup-self-hosted = "OE-Core" | 317 | DISTRO_PN_ALIAS_pn-packagegroup-self-hosted = "OE-Core" |
329 | DISTRO_PN_ALIAS_pn-package-index = "OE-Core" | 318 | DISTRO_PN_ALIAS_pn-package-index = "OE-Core" |
@@ -365,15 +354,6 @@ DISTRO_PN_ALIAS_pn-qemu-config = "OpenedHand" | |||
365 | DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand" | 354 | DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand" |
366 | DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand" | 355 | DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand" |
367 | DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core" | 356 | DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core" |
368 | DISTRO_PN_ALIAS_pn-qmmp = "Fedora=qmmp Debian=qmmp" | ||
369 | DISTRO_PN_ALIAS_pn-qt4 = "Mandriva=libqt4-devel Ubuntu=libqt4-dev" | ||
370 | DISTRO_PN_ALIAS_pn-qt4e-demo-image = "OE-Core" | ||
371 | DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT" | ||
372 | DISTRO_PN_ALIAS_pn-qt4-graphics-system = "OE-Core" | ||
373 | DISTRO_PN_ALIAS_pn-qt4-tools = "Mandriva=libqt4-devel Ubuntu=libqt4-dev" | ||
374 | DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free" | ||
375 | DISTRO_PN_ALIAS_pn-qt-demo-init = "OE-Core" | ||
376 | DISTRO_PN_ALIAS_pn-quicky = "OSPDT" | ||
377 | DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto" | 357 | DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto" |
378 | DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common" | 358 | DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common" |
379 | DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto" | 359 | DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto" |