summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-11-27 15:48:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:40:14 +0000
commit8b11ed8a75a15328bbd22d100a976cc669b84b58 (patch)
tree9b93d0fcd8fd973943ca61f126cae47066113922 /meta/conf
parent0baadc8a98daa14090b04e728fb5a44af3f545c8 (diff)
downloadpoky-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')
-rw-r--r--meta/conf/distro/include/default-distrovars.inc2
-rw-r--r--meta/conf/distro/include/distro_alias.inc20
-rw-r--r--meta/conf/documentation.conf1
3 files changed, 0 insertions, 23 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"
32COMMERCIAL_VIDEO_PLUGINS ?= "" 32COMMERCIAL_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"
34COMMERCIAL_QT ?= ""
35# COMMERCIAL_QT ?= "qmmp"
36# Set of common licenses used for license.bbclass 34# Set of common licenses used for license.bbclass
37COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" 35COMMON_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"
52DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core" 52DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core"
53DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core" 53DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core"
54DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core" 54DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core"
55DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = "OE-Core"
56DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core" 55DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core"
57DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" 56DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core"
58DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core" 57DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core"
@@ -102,7 +101,6 @@ DISTRO_PN_ALIAS_pn-fontcacheproto = "Meego=xorg-x11-proto-fontcacheproto"
102DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto" 101DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto"
103DISTRO_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" 102DISTRO_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"
104DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" 103DISTRO_PN_ALIAS_pn-formfactor = "OE-Core"
105DISTRO_PN_ALIAS_pn-fotowall = "Fedora=fotowall Ubuntu=fotowall"
106DISTRO_PN_ALIAS_pn-fstests = "OpenedHand" 104DISTRO_PN_ALIAS_pn-fstests = "OpenedHand"
107DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core" 105DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core"
108DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core" 106DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core"
@@ -261,8 +259,6 @@ DISTRO_PN_ALIAS_pn-meta-environment-qemux86 = "OE-Core"
261DISTRO_PN_ALIAS_pn-meta-environment-qemux86-64 = "OE-Core" 259DISTRO_PN_ALIAS_pn-meta-environment-qemux86-64 = "OE-Core"
262DISTRO_PN_ALIAS_pn-meta-ide-support = "OE-Core" 260DISTRO_PN_ALIAS_pn-meta-ide-support = "OE-Core"
263DISTRO_PN_ALIAS_pn-meta-toolchain = "OE-Core" 261DISTRO_PN_ALIAS_pn-meta-toolchain = "OE-Core"
264DISTRO_PN_ALIAS_pn-meta-toolchain-qt = "OE-Core"
265DISTRO_PN_ALIAS_pn-meta-toolchain-qte = "OE-Core"
266DISTRO_PN_ALIAS_pn-mini-x-session = "OSPDT" 262DISTRO_PN_ALIAS_pn-mini-x-session = "OSPDT"
267DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage" 263DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage"
268DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" 264DISTRO_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"
301DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core" 297DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core"
302DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core" 298DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core"
303DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core" 299DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core"
304DISTRO_PN_ALIAS_pn-packagegroup-core-qt = "OE-Core"
305DISTRO_PN_ALIAS_pn-packagegroup-core-qt4e = "OE-Core"
306DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core" 300DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core"
307DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core" 301DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core"
308DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-openssh = "OE-Core" 302DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-openssh = "OE-Core"
@@ -319,11 +313,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-core-x11-xserver = "OE-Core"
319DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-i586 = "OE-Core" 313DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-i586 = "OE-Core"
320DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86 = "OE-Core" 314DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86 = "OE-Core"
321DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86-64 = "OE-Core" 315DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86-64 = "OE-Core"
322DISTRO_PN_ALIAS_pn-packagegroup-qt4e = "OE-Core"
323DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-host = "OE-Core"
324DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-target = "Intel"
325DISTRO_PN_ALIAS_pn-packagegroup-qt-toolchain-host = "OE-Core"
326DISTRO_PN_ALIAS_pn-packagegroup-qt-toolchain-target = "OE-Core"
327DISTRO_PN_ALIAS_pn-packagegroup-sdk-host = "OE-Core" 316DISTRO_PN_ALIAS_pn-packagegroup-sdk-host = "OE-Core"
328DISTRO_PN_ALIAS_pn-packagegroup-self-hosted = "OE-Core" 317DISTRO_PN_ALIAS_pn-packagegroup-self-hosted = "OE-Core"
329DISTRO_PN_ALIAS_pn-package-index = "OE-Core" 318DISTRO_PN_ALIAS_pn-package-index = "OE-Core"
@@ -365,15 +354,6 @@ DISTRO_PN_ALIAS_pn-qemu-config = "OpenedHand"
365DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand" 354DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand"
366DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand" 355DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand"
367DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core" 356DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core"
368DISTRO_PN_ALIAS_pn-qmmp = "Fedora=qmmp Debian=qmmp"
369DISTRO_PN_ALIAS_pn-qt4 = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
370DISTRO_PN_ALIAS_pn-qt4e-demo-image = "OE-Core"
371DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT"
372DISTRO_PN_ALIAS_pn-qt4-graphics-system = "OE-Core"
373DISTRO_PN_ALIAS_pn-qt4-tools = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
374DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"
375DISTRO_PN_ALIAS_pn-qt-demo-init = "OE-Core"
376DISTRO_PN_ALIAS_pn-quicky = "OSPDT"
377DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto" 357DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto"
378DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common" 358DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common"
379DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto" 359DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto"
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 845559a5e7..e09f7d8829 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -23,7 +23,6 @@ do_devshell[doc] = "Starts a shell with the environment set up for development/d
23do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel" 23do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel"
24do_fetch[doc] = "Fetches the source code" 24do_fetch[doc] = "Fetches the source code"
25do_fetchall[doc] = "Fetches all remote sources required to build a target" 25do_fetchall[doc] = "Fetches all remote sources required to build a target"
26do_generate_qt_config_file[doc] = "Writes a qt.conf file for building a Qt-based application"
27do_install[doc] = "Copies files from the compilation directory to a holding area" 26do_install[doc] = "Copies files from the compilation directory to a holding area"
28do_install_ptest_base[doc] = "Copies the runtime test suite files from the compilation directory to a holding area" 27do_install_ptest_base[doc] = "Copies the runtime test suite files from the compilation directory to a holding area"
29do_kernel_checkout[doc] = "Checks out source/meta branches for a linux-yocto style kernel" 28do_kernel_checkout[doc] = "Checks out source/meta branches for a linux-yocto style kernel"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 08:37:13 +0000