[meta-oe][PATCH v2 0/2] Clean up recipes

[meta-oe][PATCH v2 0/2] Clean up recipes

[Paul Eggleton]

Drop some items that should no longer be in meta-oe.

v2 - Just the parts that havent yet been merged, with PR now preserved
as requested.


The following changes since commit 222b4eb3e469a84e929a968def6773405f369a3d:

  cloud9: add EnvironmentFile (2013-04-09 21:34:17 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/cleanup6
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/cleanup6

Paul Eggleton (2):
  packagegroup-qte-toolchain-target: remove bbappend content
  qt4: remove bbappend content

 .../packagegroups/packagegroup-qte-toolchain-target.bbappend      |    5 -----
 meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend                |    5 -----
 meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend                |    5 -----
 3 files changed, 15 deletions(-)

-- 
1.7.10.4

[meta-oe][PATCH v2 1/2] packagegroup-qte-toolchain-target: remove bbappend content

[Paul Eggleton]

This added Qwt to the Qt Embedded toolchain. This is a distro policy
decision, and in any case Qwt is a third-party library which is not part
of Qt. Distros that wish to do this should add this bbappend to their
own layers.

(We have to preserve the PRINC value to avoid PR going backwards.)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../packagegroups/packagegroup-qte-toolchain-target.bbappend      |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
index f6e5dd9..d9f1c29 100644
--- a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
+++ b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
@@ -1,6 +1 @@
-RDEPENDS_${PN} += "qwt-e-dev"
-
-# qwt-e conflicts with qwt, so only one can be built in world and this pulls qwt-e
-EXCLUDE_FROM_WORLD = "1"
-
 PRINC := "${@int(PRINC) + 1}"
-- 
1.7.10.4

[meta-oe][PATCH v2 2/2] qt4: remove bbappend content

[Paul Eggleton]

These changes to Qt's configuration need to be applied in distro layers,
not in meta-oe.

(We have to preserve the PRINC value to avoid PR going backwards.)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend |    5 -----
 meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend |    5 -----
 2 files changed, 10 deletions(-)

diff --git a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
index 27cac11..d9f1c29 100644
--- a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
@@ -1,6 +1 @@
-DEPENDS += "mysql5 postgresql sqlite"
-QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql -plugin-sql-sqlite2 -plugin-sql-sqlite"
-QT_CONFIG_FLAGS += "-I${STAGING_INCDIR}/mysql \
-                    -I${STAGING_INCDIR}/postgresql"
-
 PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
index 27cac11..d9f1c29 100644
--- a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
@@ -1,6 +1 @@
-DEPENDS += "mysql5 postgresql sqlite"
-QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql -plugin-sql-sqlite2 -plugin-sql-sqlite"
-QT_CONFIG_FLAGS += "-I${STAGING_INCDIR}/mysql \
-                    -I${STAGING_INCDIR}/postgresql"
-
 PRINC := "${@int(PRINC) + 1}"
-- 
1.7.10.4

Re: [meta-oe][PATCH v2 2/2] qt4: remove bbappend content

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 10-04-13 17:57, Paul Eggleton schreef:
> These changes to Qt's configuration need to be applied in distro layers, 
> not in meta-oe.
> 
> (We have to preserve the PRINC value to avoid PR going backwards.)
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- 
> meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend |    5 ----- 
> meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend |    5 ----- 2 files
> changed, 10 deletions(-)
> 
> diff --git a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
> b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend index
> 27cac11..d9f1c29 100644 ---
> a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend +++
> b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend @@ -1,6 +1 @@ 
> -DEPENDS += "mysql5 postgresql sqlite" -QT_SQL_DRIVER_FLAGS =
> "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql
> -plugin-sql-sqlite2 -plugin-sql-sqlite" -QT_CONFIG_FLAGS +=
> "-I${STAGING_INCDIR}/mysql \ -
> -I${STAGING_INCDIR}/postgresql" - PRINC := "${@int(PRINC) + 1}" diff
> --git a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
> b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend index
> 27cac11..d9f1c29 100644 ---
> a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend +++
> b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend @@ -1,6 +1 @@ 
> -DEPENDS += "mysql5 postgresql sqlite" -QT_SQL_DRIVER_FLAGS =
> "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql
> -plugin-sql-sqlite2 -plugin-sql-sqlite" -QT_CONFIG_FLAGS +=
> "-I${STAGING_INCDIR}/mysql \ -
> -I${STAGING_INCDIR}/postgresql" - PRINC := "${@int(PRINC) + 1}"

So with the reason given "I don't want to rebuilt QT when adding meta-oe" to
remove this, this doesn't actually accomplish that. You are adding an extra
rebuild with this.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFRZZBcMkyGM64RGpERAh2tAJ44aceRHVjTRLixQw36lBM6hj6FtgCgkjqY
3/srLPdum6RLgzFzCmQRs5I=
=rQLL
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH v2 2/2] qt4: remove bbappend content

[Paul Eggleton]

On Wednesday 10 April 2013 18:16:28 Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Op 10-04-13 17:57, Paul Eggleton schreef:
> > These changes to Qt's configuration need to be applied in distro layers,
> > not in meta-oe.
> > 
> > (We have to preserve the PRINC value to avoid PR going backwards.)
> > 
> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---
> > meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend |    5 -----
> > meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend |    5 ----- 2 files
> > changed, 10 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
> > b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend index
> > 27cac11..d9f1c29 100644 ---
> > a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend +++
> > b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend @@ -1,6 +1 @@
> > -DEPENDS += "mysql5 postgresql sqlite" -QT_SQL_DRIVER_FLAGS =
> > "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql
> > -plugin-sql-sqlite2 -plugin-sql-sqlite" -QT_CONFIG_FLAGS +=
> > "-I${STAGING_INCDIR}/mysql \ -
> > -I${STAGING_INCDIR}/postgresql" - PRINC := "${@int(PRINC) + 1}" diff
> > --git a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
> > b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend index
> > 27cac11..d9f1c29 100644 ---
> > a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend +++
> > b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend @@ -1,6 +1 @@
> > -DEPENDS += "mysql5 postgresql sqlite" -QT_SQL_DRIVER_FLAGS =
> > "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql
> > -plugin-sql-sqlite2 -plugin-sql-sqlite" -QT_CONFIG_FLAGS +=
> > "-I${STAGING_INCDIR}/mysql \ -
> > -I${STAGING_INCDIR}/postgresql" - PRINC := "${@int(PRINC) + 1}"
> 
> So with the reason given "I don't want to rebuilt QT when adding meta-oe" to
> remove this, this doesn't actually accomplish that. You are adding an extra
> rebuild with this.

That's the reason I don't want the bbappend to exist at all. In the absence of 
the ability to have that for now, let's at least not have the configuration 
changed and not have postgres and mysql built just by adding meta-oe.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-oe][PATCH v2 2/2] qt4: remove bbappend content

[Anders Darander]

On Wed, Apr 10, 2013 at 6:26 PM, Paul Eggleton <
paul.eggleton@linux.intel.com> wrote:

> On Wednesday 10 April 2013 18:16:28 Koen Kooi wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Op 10-04-13 17:57, Paul Eggleton schreef:
> > > These changes to Qt's configuration need to be applied in distro
> layers,
> > > not in meta-oe.
> > >
> > > (We have to preserve the PRINC value to avoid PR going backwards.)
> > >
> > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---
> > > meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend |    5 -----
> > > meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend |    5 ----- 2 files
> > > changed, 10 deletions(-)
> > >
> > > diff --git a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
> > > b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend index
> > > 27cac11..d9f1c29 100644 ---
> > > a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend +++
> > > b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend @@ -1,6 +1 @@
> > > -DEPENDS += "mysql5 postgresql sqlite" -QT_SQL_DRIVER_FLAGS =
> > > "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql
> > > -plugin-sql-sqlite2 -plugin-sql-sqlite" -QT_CONFIG_FLAGS +=
> > > "-I${STAGING_INCDIR}/mysql \ -
> > > -I${STAGING_INCDIR}/postgresql" - PRINC := "${@int(PRINC) + 1}" diff
> > > --git a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
> > > b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend index
> > > 27cac11..d9f1c29 100644 ---
> > > a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend +++
> > > b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend @@ -1,6 +1 @@
> > > -DEPENDS += "mysql5 postgresql sqlite" -QT_SQL_DRIVER_FLAGS =
> > > "-no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql
> > > -plugin-sql-sqlite2 -plugin-sql-sqlite" -QT_CONFIG_FLAGS +=
> > > "-I${STAGING_INCDIR}/mysql \ -
> > > -I${STAGING_INCDIR}/postgresql" - PRINC := "${@int(PRINC) + 1}"
> >
> > So with the reason given "I don't want to rebuilt QT when adding
> meta-oe" to
> > remove this, this doesn't actually accomplish that. You are adding an
> extra
> > rebuild with this.
>
> That's the reason I don't want the bbappend to exist at all. In the
> absence of
> the ability to have that for now, let's at least not have the configuration
> changed and not have postgres and mysql built just by adding meta-oe.
>

I'd definitely like to have this patch applied, just for the same reason as
Paul has stated. I don't want to have to build postgres and mysql, just
because I need qt4. Currently I'm solving this using a number of
oe_filter_out's in my own bbappend, but I'd prefer to reduce them to as few
as possible.

The extra rebuild (which only will occur once) caused by applying this
patch is a small price to accomplish this.

 I'll go back and continue thinking about how a triplet version of
PACKAGECONFIG could look like...

Cheers,
Anders

-- 
Anders Darander