Patchwork [meta-oe,4/4] qt4: remove bbappends

login
register
mail settings
Submitter Paul Eggleton
Date April 5, 2013, 11:35 p.m.
Message ID <9e4a915b5a1e871ee28c3b723475d143162a8286.1365204818.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/47571/
State Changes Requested, archived
Headers show

Comments

Paul Eggleton - April 5, 2013, 11:35 p.m.
These changes to Qt's configuration need to be applied in distro layers,
not in meta-oe.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend |    6 ------
 meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend |    6 ------
 2 files changed, 12 deletions(-)
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
Otavio Salvador - April 6, 2013, 1:36 p.m.
On Fri, Apr 5, 2013 at 8:35 PM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> These changes to Qt's configuration need to be applied in distro layers,
> not in meta-oe.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

NACK!

Keep PRINC as otherwise revision will go backwards.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Paul Eggleton - April 6, 2013, 7:28 p.m.
On Saturday 06 April 2013 10:36:41 Otavio Salvador wrote:
> On Fri, Apr 5, 2013 at 8:35 PM, Paul Eggleton
> <paul.eggleton@linux.intel.com> wrote:
> > These changes to Qt's configuration need to be applied in distro layers,
> > not in meta-oe.
> > 
> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> 
> NACK!
> 
> Keep PRINC as otherwise revision will go backwards.

Sigh... Oh well I guess Qt 4.8.5 is just around the corner and then we can 
drop this bbappend. When can we drop the packagegroup one though?

Cheers,
Paul
Otavio Salvador - April 6, 2013, 8:55 p.m.
On Sat, Apr 6, 2013 at 4:28 PM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> On Saturday 06 April 2013 10:36:41 Otavio Salvador wrote:
>> On Fri, Apr 5, 2013 at 8:35 PM, Paul Eggleton
>> <paul.eggleton@linux.intel.com> wrote:
>> > These changes to Qt's configuration need to be applied in distro layers,
>> > not in meta-oe.
>> >
>> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
>>
>> NACK!
>>
>> Keep PRINC as otherwise revision will go backwards.
>
> Sigh... Oh well I guess Qt 4.8.5 is just around the corner and then we can
> drop this bbappend. When can we drop the packagegroup one though?

We can't; but it does not hurt as I think it won't be removed from
oe-core any time soon ;-)

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

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
deleted file mode 100644
index 27cac11..0000000
--- a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@ 
-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
deleted file mode 100644
index 27cac11..0000000
--- a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@ 
-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}"