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

login
register
mail settings
Submitter Paul Eggleton
Date April 10, 2013, 3:57 p.m.
Message ID <a2eefe761b129b700bbf0a1053a05999ecb69e12.1365609345.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/47845/
State Accepted, archived
Commit 64c6887ca19d2ce52e538186c93163dddf68438f
Headers show

Comments

Paul Eggleton - April 10, 2013, 3:57 p.m.
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(-)
Koen Kooi - April 10, 2013, 4:16 p.m.
-----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-----
Paul Eggleton - April 10, 2013, 4:26 p.m.
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
Anders Darander - April 11, 2013, 11:02 a.m.
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

Patch

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}"