summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-11-27 16:05:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-08 13:57:32 +0000
commitd914c7f3cbb4a0059e90c9d3b0f88c1e566af302 (patch)
treec15f6840d71657d3e3dfaa3b3c19df7dbb1c1b8e
parent0f3ad7c77aa0f8bb7641af1886e1420cdfa8419f (diff)
downloadpoky-d914c7f3cbb4a0059e90c9d3b0f88c1e566af302.tar.gz
meta-yocto: drop qt4 references
(From meta-yocto rev: c6abe9550785690155929c5a02e0f02a6abab9ab) 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>
-rw-r--r--meta-yocto/conf/distro/include/maintainers.inc15
-rw-r--r--meta-yocto/conf/distro/poky-tiny.conf1
-rw-r--r--meta-yocto/conf/local.conf.sample.extended3
3 files changed, 1 insertions, 18 deletions
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 6fd83e7691..2148801b6e 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -172,7 +172,6 @@ RECIPE_MAINTAINER_pn-fontconfig = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
172RECIPE_MAINTAINER_pn-fontsproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>" 172RECIPE_MAINTAINER_pn-fontsproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
173RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi <Qi.Chen@windriver.com>" 173RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi <Qi.Chen@windriver.com>"
174RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John <maxin.john@intel.com>" 174RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John <maxin.john@intel.com>"
175RECIPE_MAINTAINER_pn-fotowall = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
176RECIPE_MAINTAINER_pn-freetype = "Jussi Kukkonen <jussi.kukkonen@intel.com>" 175RECIPE_MAINTAINER_pn-freetype = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
177RECIPE_MAINTAINER_pn-fstests = "Alexander Kanavin <alexander.kanavin@intel.com>" 176RECIPE_MAINTAINER_pn-fstests = "Alexander Kanavin <alexander.kanavin@intel.com>"
178RECIPE_MAINTAINER_pn-gawk = "Chen Qi <Qi.Chen@windriver.com>" 177RECIPE_MAINTAINER_pn-gawk = "Chen Qi <Qi.Chen@windriver.com>"
@@ -452,7 +451,6 @@ RECIPE_MAINTAINER_pn-mesa-demos = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
452RECIPE_MAINTAINER_pn-mesa-gl = "Jussi Kukkonen <jussi.kukkonen@intel.com>" 451RECIPE_MAINTAINER_pn-mesa-gl = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
453RECIPE_MAINTAINER_pn-meta-ide-support = "Cristian Iorga <cristian.iorga@intel.com>" 452RECIPE_MAINTAINER_pn-meta-ide-support = "Cristian Iorga <cristian.iorga@intel.com>"
454RECIPE_MAINTAINER_pn-meta-toolchain = "Cristian Iorga <cristian.iorga@intel.com>" 453RECIPE_MAINTAINER_pn-meta-toolchain = "Cristian Iorga <cristian.iorga@intel.com>"
455RECIPE_MAINTAINER_pn-meta-toolchain-qte = "Cristian Iorga <cristian.iorga@intel.com>"
456RECIPE_MAINTAINER_pn-mingetty = "Kai Kang <kai.kang@windriver.com>" 454RECIPE_MAINTAINER_pn-mingetty = "Kai Kang <kai.kang@windriver.com>"
457RECIPE_MAINTAINER_pn-mini-x-session = "Jussi Kukkonen <jussi.kukkonen@intel.com>" 455RECIPE_MAINTAINER_pn-mini-x-session = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
458RECIPE_MAINTAINER_pn-minicom = "Maxin B. John <maxin.john@intel.com>" 456RECIPE_MAINTAINER_pn-minicom = "Maxin B. John <maxin.john@intel.com>"
@@ -471,9 +469,7 @@ RECIPE_MAINTAINER_pn-mtdev = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
471RECIPE_MAINTAINER_pn-mtools = "Maxin B. John <maxin.john@intel.com>" 469RECIPE_MAINTAINER_pn-mtools = "Maxin B. John <maxin.john@intel.com>"
472RECIPE_MAINTAINER_pn-mx-1.0 = "Jussi Kukkonen <jussi.kukkonen@intel.com>" 470RECIPE_MAINTAINER_pn-mx-1.0 = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
473RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>" 471RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>"
474RECIPE_MAINTAINER_pn-nativesdk-packagegroup-qte-toolchain-host = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
475RECIPE_MAINTAINER_pn-nativesdk-qemu-helper = "Cristian Iorga <cristian.iorga@intel.com>" 472RECIPE_MAINTAINER_pn-nativesdk-qemu-helper = "Cristian Iorga <cristian.iorga@intel.com>"
476RECIPE_MAINTAINER_pn-nativesdk-qt4-tools = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
477RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia <hongxu.jia@windriver.com>" 473RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia <hongxu.jia@windriver.com>"
478RECIPE_MAINTAINER_pn-neard = "Maxin B. John <maxin.john@intel.com>" 474RECIPE_MAINTAINER_pn-neard = "Maxin B. John <maxin.john@intel.com>"
479RECIPE_MAINTAINER_pn-neon = "Maxin B. John <maxin.john@intel.com>" 475RECIPE_MAINTAINER_pn-neon = "Maxin B. John <maxin.john@intel.com>"
@@ -512,8 +508,6 @@ RECIPE_MAINTAINER_pn-packagegroup-core-directfb = "Ross Burton <ross.burton@inte
512RECIPE_MAINTAINER_pn-packagegroup-core-full-cmdline = "Ross Burton <ross.burton@intel.com>" 508RECIPE_MAINTAINER_pn-packagegroup-core-full-cmdline = "Ross Burton <ross.burton@intel.com>"
513RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Ross Burton <ross.burton@intel.com>" 509RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Ross Burton <ross.burton@intel.com>"
514RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Ross Burton <ross.burton@intel.com>" 510RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Ross Burton <ross.burton@intel.com>"
515RECIPE_MAINTAINER_pn-packagegroup-core-qt = "Ross Burton <ross.burton@intel.com>"
516RECIPE_MAINTAINER_pn-packagegroup-core-qt4e = "Ross Burton <ross.burton@intel.com>"
517RECIPE_MAINTAINER_pn-packagegroup-core-sdk = "Ross Burton <ross.burton@intel.com>" 511RECIPE_MAINTAINER_pn-packagegroup-core-sdk = "Ross Burton <ross.burton@intel.com>"
518RECIPE_MAINTAINER_pn-packagegroup-core-ssh-dropbear = "Ross Burton <ross.burton@intel.com>" 512RECIPE_MAINTAINER_pn-packagegroup-core-ssh-dropbear = "Ross Burton <ross.burton@intel.com>"
519RECIPE_MAINTAINER_pn-packagegroup-core-ssh-openssh = "Ross Burton <ross.burton@intel.com>" 513RECIPE_MAINTAINER_pn-packagegroup-core-ssh-openssh = "Ross Burton <ross.burton@intel.com>"
@@ -525,7 +519,6 @@ RECIPE_MAINTAINER_pn-packagegroup-core-x11 = "Ross Burton <ross.burton@intel.com
525RECIPE_MAINTAINER_pn-packagegroup-core-x11-base = "Ross Burton <ross.burton@intel.com>" 519RECIPE_MAINTAINER_pn-packagegroup-core-x11-base = "Ross Burton <ross.burton@intel.com>"
526RECIPE_MAINTAINER_pn-packagegroup-core-x11-sato = "Ross Burton <ross.burton@intel.com>" 520RECIPE_MAINTAINER_pn-packagegroup-core-x11-sato = "Ross Burton <ross.burton@intel.com>"
527RECIPE_MAINTAINER_pn-packagegroup-core-x11-xserver = "Ross Burton <ross.burton@intel.com>" 521RECIPE_MAINTAINER_pn-packagegroup-core-x11-xserver = "Ross Burton <ross.burton@intel.com>"
528RECIPE_MAINTAINER_pn-packagegroup-qte-toolchain-target = "Ross Burton <ross.burton@intel.com>"
529RECIPE_MAINTAINER_pn-packagegroup-self-hosted = "Ross Burton <ross.burton@intel.com>" 522RECIPE_MAINTAINER_pn-packagegroup-self-hosted = "Ross Burton <ross.burton@intel.com>"
530RECIPE_MAINTAINER_pn-pango = "Jussi Kukkonen <jussi.kukkonen@intel.com>" 523RECIPE_MAINTAINER_pn-pango = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
531RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>" 524RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>"
@@ -585,14 +578,6 @@ RECIPE_MAINTAINER_pn-python3-distribute = "Alejandro Hernandez <alejandro.hernan
585RECIPE_MAINTAINER_pn-python3-setuptools = "Alejandro Hernandez <alejandro.hernandez@linux.intel.com>" 578RECIPE_MAINTAINER_pn-python3-setuptools = "Alejandro Hernandez <alejandro.hernandez@linux.intel.com>"
586RECIPE_MAINTAINER_pn-qemu = "Cristian Iorga <cristian.iorga@intel.com>" 579RECIPE_MAINTAINER_pn-qemu = "Cristian Iorga <cristian.iorga@intel.com>"
587RECIPE_MAINTAINER_pn-qemu-helper-native = "Cristian Iorga <cristian.iorga@intel.com>" 580RECIPE_MAINTAINER_pn-qemu-helper-native = "Cristian Iorga <cristian.iorga@intel.com>"
588RECIPE_MAINTAINER_pn-qmmp = "Hongxu Jia <hongxu.jia@windriver.com>"
589RECIPE_MAINTAINER_pn-qt-demo-init = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
590RECIPE_MAINTAINER_pn-qt4-embedded = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
591RECIPE_MAINTAINER_pn-qt4-graphics-system = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
592RECIPE_MAINTAINER_pn-qt4-native = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
593RECIPE_MAINTAINER_pn-qt4-x11-free = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
594RECIPE_MAINTAINER_pn-qt4e-demo-image = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
595RECIPE_MAINTAINER_pn-quicky = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
596RECIPE_MAINTAINER_pn-quilt = "Robert Yang <liezhi.yang@windriver.com>" 581RECIPE_MAINTAINER_pn-quilt = "Robert Yang <liezhi.yang@windriver.com>"
597RECIPE_MAINTAINER_pn-quota = "Maxin B. John <maxin.john@intel.com>" 582RECIPE_MAINTAINER_pn-quota = "Maxin B. John <maxin.john@intel.com>"
598RECIPE_MAINTAINER_pn-randrproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>" 583RECIPE_MAINTAINER_pn-randrproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
index fbcbf1ae71..fcf0a1ec0c 100644
--- a/meta-yocto/conf/distro/poky-tiny.conf
+++ b/meta-yocto/conf/distro/poky-tiny.conf
@@ -137,7 +137,6 @@ PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny"
137PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny" 137PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny"
138PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny" 138PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny"
139PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny" 139PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny"
140PNBLACKLIST[qt4e-demo-image] = "not buildable with poky-tiny"
141PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny" 140PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny"
142 141
143# Disable python usage in opkg-utils since it won't build with tiny config 142# Disable python usage in opkg-utils since it won't build with tiny config
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index bc765a100f..925270b011 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -191,8 +191,7 @@
191# commercial_lame \ 191# commercial_lame \
192# commercial_libmad \ 192# commercial_libmad \
193# commercial_libomxil \ 193# commercial_libomxil \
194# commercial_mpeg2dec \ 194# commercial_mpeg2dec"
195# commercial_qmmp"
196 195
197 196
198# 197#