Patchwork qt4.inc: remove the optional documentation package from the demo's RRECOMMENDS

login
register
mail settings
Submitter Denis Carikli
Date Sept. 5, 2011, 1:24 p.m.
Message ID <1315229054-1859-1-git-send-email-denis@eukrea.com>
Download mbox | patch
Permalink /patch/10997/
State Superseded
Headers show

Comments

Denis Carikli - Sept. 5, 2011, 1:24 p.m.
The documentation is 285M and doesn't fit on the NAND of many machines.

Signed-off-by: Denis Carikli <denis@eukrea.com>
---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
Koen Kooi - Sept. 5, 2011, 3:38 p.m.
Op 5 sep. 2011 om 15:24 heeft Denis Carikli <denis@eukrea.com> het volgende geschreven:

> The documentation is 285M and doesn't fit on the NAND of many machines.

That does remove all the descriptions from the qtdemo app, so removing all docs isn't a good idea


> 
> Signed-off-by: Denis Carikli <denis@eukrea.com>
> ---
> meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
> meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
> meta/recipes-qt/qt4/qt4.inc          |    3 +--
> 3 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
> index d464a1d..9914c61 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded.inc
> +++ b/meta/recipes-qt/qt4/qt4-embedded.inc
> @@ -3,7 +3,7 @@ SECTION = "libs"
> LICENSE = "LGPLv2.1 | GPLv3"
> HOMEPAGE = "http://qt.nokia.com"
> DEPENDS += "directfb tslib"
> -INC_PR = "r29"
> +INC_PR = "r30"
> 
> QT_BASE_NAME ?= "qt4-embedded"
> QT_BASE_LIB  ?= "libqt-embedded"
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index 234cb89..0a714be 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
> SECTION = "x11/libs"
> DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
> 
> -INC_PR = "r26"
> +INC_PR = "r27"
> 
> QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
> QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 5545be7..8a6b59a 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -124,8 +124,7 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += " \
>             ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
>             ${QT_BASE_NAME}-plugin-imageformat-jpeg \
>             ${QT_BASE_NAME}-qml-plugins \
> -            ${QT_BASE_NAME}-assistant \
> -            ${PN}-doc"
> +            ${QT_BASE_NAME}-assistant"
> RRECOMMENDS_${QT_BASE_NAME}-examples += " \
>             ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
>             ${QT_BASE_NAME}-plugin-imageformat-jpeg \
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Eric BENARD - Sept. 5, 2011, 3:47 p.m.
Hi Koen,

Le 05/09/2011 17:38, Koen Kooi a écrit :
> Op 5 sep. 2011 om 15:24 heeft Denis Carikli<denis@eukrea.com>  het volgende geschreven:
>
>> The documentation is 285M and doesn't fit on the NAND of many machines.
>
> That does remove all the descriptions from the qtdemo app, so removing all docs isn't a good idea
>
yes, that brings oe-core to the oe dev state (where the docs were not installed).
This makes qt4-demo images usable on systems with 256 MB flash because the doc 
package is huge.

Next step will be to split the doc package in order to have the descriptions 
in one package and the code in an other one. We will try to find time to do 
this in a few days.

Eric
Paul Eggleton - Sept. 5, 2011, 3:51 p.m.
On Monday 05 September 2011 16:38:42 Koen Kooi wrote:
> Op 5 sep. 2011 om 15:24 heeft Denis Carikli <denis@eukrea.com> het volgende 
geschreven:
> > The documentation is 285M and doesn't fit on the NAND of many machines.
> 
> That does remove all the descriptions from the qtdemo app, so removing all
> docs isn't a good idea

This is what I was afraid of when the discussion came up on IRC. The proper 
solution is to split out the files required for the descriptions to a separate 
package. I don't know which files those are however.

Cheers,
Paul
Eric BENARD - Sept. 5, 2011, 4:04 p.m.
Hi Koen,

Le 05/09/2011 17:38, Koen Kooi a écrit :
> Op 5 sep. 2011 om 15:24 heeft Denis Carikli<denis@eukrea.com>  het volgende geschreven:
>
>> The documentation is 285M and doesn't fit on the NAND of many machines.
>
> That does remove all the descriptions from the qtdemo app, so removing all docs isn't a good idea
>
yes, that brings oe-core to the oe dev state (where the docs were not installed).
This makes qt4-demo images usable on systems with 256 MB flash because the doc 
package is huge.

Next step will be to split the doc package in order to have the descriptions 
in one package and the code in an other one. We will try to find time to do 
this in a few days.

Eric
Eric BENARD - Sept. 5, 2011, 9:13 p.m.
Le 05/09/2011 18:04, Eric Bénard a écrit :
> Le 05/09/2011 17:38, Koen Kooi a écrit :
>> Op 5 sep. 2011 om 15:24 heeft Denis Carikli<denis@eukrea.com> het volgende
>> geschreven:
>>
>>> The documentation is 285M and doesn't fit on the NAND of many machines.
>>
>> That does remove all the descriptions from the qtdemo app, so removing all
>> docs isn't a good idea
>>
> yes, that brings oe-core to the oe dev state (where the docs were not installed).
> This makes qt4-demo images usable on systems with 256 MB flash because the doc
> package is huge.
>
FWIW with this patch we have exactly the same behaviour as (for example) a 
Fedora 15 : installing qt-demos brings a qt-demo program which can launch the 
demos and examples but lacks the explanation text, installing qt-docs brings 
the text (in a 126MB rpm !).

> Next step will be to split the doc package in order to have the descriptions
> in one package and the code in an other one. We will try to find time to do
> this in a few days.
>
in fact the text comes from the html directory in the qt doc which is quite 
big : 184MB. After a few research, it seems "only" 36MB of these 184MB are 
used by qtdemo, so we could quite easily split qt-doc in 2 packages : 
qt-demo-doc and qt-doc.

Eric

Patch

diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index d464a1d..9914c61 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@  SECTION = "libs"
 LICENSE = "LGPLv2.1 | GPLv3"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r29"
+INC_PR = "r30"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 234cb89..0a714be 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@  HOMEPAGE = "http://qt.nokia.com"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r26"
+INC_PR = "r27"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 5545be7..8a6b59a 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -124,8 +124,7 @@  RRECOMMENDS_${QT_BASE_NAME}-demos += " \
             ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
             ${QT_BASE_NAME}-plugin-imageformat-jpeg \
             ${QT_BASE_NAME}-qml-plugins \
-            ${QT_BASE_NAME}-assistant \
-            ${PN}-doc"
+            ${QT_BASE_NAME}-assistant"
 RRECOMMENDS_${QT_BASE_NAME}-examples += " \
             ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
             ${QT_BASE_NAME}-plugin-imageformat-jpeg \