[PATCH 0/3] Remove qt4 references from poky

[PATCH 0/3] Remove qt4 references from poky

[Alexander Kanavin]

This patchset complements the qt4 removal patchset that is sent to
oe-core mailing list.

The following changes since commit 613ccfb98734254bd8feeefcc986dfc545d38f85:

  packagegroup-core-lsb: treat qt4 packages same as qt3 packages (2015-12-03 15:57:34 +0200)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib akanavin/remove-qt4
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/remove-qt4

Alexander Kanavin (3):
  maintainers.inc: drop qt4 references
  poky-tiny.conf: drop qt4 references
  local.conf.sample.extended: drop qt4 references

 meta-yocto/conf/distro/include/maintainers.inc | 15 ---------------
 meta-yocto/conf/distro/poky-tiny.conf          |  1 -
 meta-yocto/conf/local.conf.sample.extended     |  3 +--
 3 files changed, 1 insertion(+), 18 deletions(-)

-- 
2.6.2

[PATCH 1/3] maintainers.inc: drop qt4 references

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-yocto/conf/distro/include/maintainers.inc | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 6fd83e7..2148801 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>"
 RECIPE_MAINTAINER_pn-fontsproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi <Qi.Chen@windriver.com>"
 RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John <maxin.john@intel.com>"
-RECIPE_MAINTAINER_pn-fotowall = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-freetype = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-fstests = "Alexander Kanavin <alexander.kanavin@intel.com>"
 RECIPE_MAINTAINER_pn-gawk = "Chen Qi <Qi.Chen@windriver.com>"
@@ -452,7 +451,6 @@ RECIPE_MAINTAINER_pn-mesa-demos = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-mesa-gl = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-meta-ide-support = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-meta-toolchain = "Cristian Iorga <cristian.iorga@intel.com>"
-RECIPE_MAINTAINER_pn-meta-toolchain-qte = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-mingetty = "Kai Kang <kai.kang@windriver.com>"
 RECIPE_MAINTAINER_pn-mini-x-session = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-minicom = "Maxin B. John <maxin.john@intel.com>"
@@ -471,9 +469,7 @@ RECIPE_MAINTAINER_pn-mtdev = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-mtools = "Maxin B. John <maxin.john@intel.com>"
 RECIPE_MAINTAINER_pn-mx-1.0 = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>"
-RECIPE_MAINTAINER_pn-nativesdk-packagegroup-qte-toolchain-host = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-nativesdk-qemu-helper = "Cristian Iorga <cristian.iorga@intel.com>"
-RECIPE_MAINTAINER_pn-nativesdk-qt4-tools = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia <hongxu.jia@windriver.com>"
 RECIPE_MAINTAINER_pn-neard = "Maxin B. John <maxin.john@intel.com>"
 RECIPE_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
 RECIPE_MAINTAINER_pn-packagegroup-core-full-cmdline = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Ross Burton <ross.burton@intel.com>"
-RECIPE_MAINTAINER_pn-packagegroup-core-qt = "Ross Burton <ross.burton@intel.com>"
-RECIPE_MAINTAINER_pn-packagegroup-core-qt4e = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-packagegroup-core-sdk = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-packagegroup-core-ssh-dropbear = "Ross Burton <ross.burton@intel.com>"
 RECIPE_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
 RECIPE_MAINTAINER_pn-packagegroup-core-x11-base = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-packagegroup-core-x11-sato = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-packagegroup-core-x11-xserver = "Ross Burton <ross.burton@intel.com>"
-RECIPE_MAINTAINER_pn-packagegroup-qte-toolchain-target = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-packagegroup-self-hosted = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-pango = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>"
@@ -585,14 +578,6 @@ RECIPE_MAINTAINER_pn-python3-distribute = "Alejandro Hernandez <alejandro.hernan
 RECIPE_MAINTAINER_pn-python3-setuptools = "Alejandro Hernandez <alejandro.hernandez@linux.intel.com>"
 RECIPE_MAINTAINER_pn-qemu = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-qemu-helper-native = "Cristian Iorga <cristian.iorga@intel.com>"
-RECIPE_MAINTAINER_pn-qmmp = "Hongxu Jia <hongxu.jia@windriver.com>"
-RECIPE_MAINTAINER_pn-qt-demo-init = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
-RECIPE_MAINTAINER_pn-qt4-embedded = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
-RECIPE_MAINTAINER_pn-qt4-graphics-system = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
-RECIPE_MAINTAINER_pn-qt4-native = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
-RECIPE_MAINTAINER_pn-qt4-x11-free = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
-RECIPE_MAINTAINER_pn-qt4e-demo-image = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
-RECIPE_MAINTAINER_pn-quicky = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
 RECIPE_MAINTAINER_pn-quilt = "Robert Yang <liezhi.yang@windriver.com>"
 RECIPE_MAINTAINER_pn-quota = "Maxin B. John <maxin.john@intel.com>"
 RECIPE_MAINTAINER_pn-randrproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>"
-- 
2.6.2

[PATCH 2/3] poky-tiny.conf: drop qt4 references

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-yocto/conf/distro/poky-tiny.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
index b0227de..c6f6711 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"
 PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny"
 PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny"
 PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny"
-PNBLACKLIST[qt4e-demo-image] = "not buildable with poky-tiny"
 PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny"
 
 # Disable python usage in opkg-utils since it won't build with tiny config
-- 
2.6.2

[PATCH 3/3] local.conf.sample.extended: drop qt4 references

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-yocto/conf/local.conf.sample.extended | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index bc765a1..925270b 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -191,8 +191,7 @@
 #                           commercial_lame \
 #                           commercial_libmad \
 #                           commercial_libomxil \
-#                           commercial_mpeg2dec \
-#                           commercial_qmmp"
+#                           commercial_mpeg2dec"
 
 
 #
-- 
2.6.2

Re: [PATCH 0/3] Remove qt4 references from poky

[Scott Rifenbark]

[-- Attachment #1: Type: text/plain, Size: 1835 bytes --]

Hi,

There are some references to qt4 in the YP Reference Manual.  Can you tell
me if these simply need removed from the documentation?  Or, if some
modification is necessary for each.  Here they are:

http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#migration-2.0-Gstreamer-0.10-removed

http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#ref-classes-qt4*

http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#ref-images
- Last item in that list.

http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#ref-features-image
- There is a "qt4-pkgs" item in the second list of this section.

Thanks,
Scott

On Thu, Dec 3, 2015 at 8:34 AM, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> This patchset complements the qt4 removal patchset that is sent to
> oe-core mailing list.
>
> The following changes since commit
> 613ccfb98734254bd8feeefcc986dfc545d38f85:
>
>   packagegroup-core-lsb: treat qt4 packages same as qt3 packages
> (2015-12-03 15:57:34 +0200)
>
> are available in the git repository at:
>
>   git://git.yoctoproject.org/poky-contrib akanavin/remove-qt4
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/remove-qt4
>
> Alexander Kanavin (3):
>   maintainers.inc: drop qt4 references
>   poky-tiny.conf: drop qt4 references
>   local.conf.sample.extended: drop qt4 references
>
>  meta-yocto/conf/distro/include/maintainers.inc | 15 ---------------
>  meta-yocto/conf/distro/poky-tiny.conf          |  1 -
>  meta-yocto/conf/local.conf.sample.extended     |  3 +--
>  3 files changed, 1 insertion(+), 18 deletions(-)
>
> --
> 2.6.2
>
> --
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>

[-- Attachment #2: Type: text/html, Size: 3089 bytes --]

Re: [PATCH 0/3] Remove qt4 references from poky

[alexander.kanavin]

> There are some references to qt4 in the YP Reference Manual.  Can you tell
> me if these simply need removed from the documentation?  Or, if some
> modification is necessary for each.  Here they are:
>
> http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#migration-2.0-Gstreamer-0.10-removed

This is in a section about updating to YP2.0. That version is not
affected, and will continue to carry Qt4 packages.

But you probably do want to add a note to a similar section about moving
to YP2.1. Something along these lines:

"Qt4 recipes and classes have been removed in YP 2.1 because Qt4.x has
reached end of life upstream. For legacy applications and LSB compliancy
purposes Qt4 can be found in meta-qt4 repository, and for any new
development Qt5 is available at meta-qt5 repository(provide links to
both)."

> http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#ref-classes-qt4*

Should be removed, also remove the preceding qmake* section.

> http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#ref-images
> - Last item in that list.

Should be removed.

> http://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#ref-features-image
> - There is a "qt4-pkgs" item in the second list of this section.

Should be removed.

There are also a few references to Qt in general in the same manual (e.g.
recipes-qt, COMMERCIAL_QT, do_generate_qt_config), those should be removed
as well. Let me know if you need specific guidance for them, or I can
review your documentation patch.

Thanks,
Alex