Clean up recipes
cover Clean up recipes
Drop some items that should no longer be in meta-oe.
The following changes since commit cbe69cab46335b48de85001f7dd07da765ba8b7b:
packagegroup-xfce-extended: add xfce4-closebutton-plugin (2013-04-04 08:14:22 +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 (4):
libmad: remove
icon-naming-utils: remove packagegroup-qte-toolchain-target: remove bbappend
qt4: remove bbappends
.../icon-naming-utils/icon-naming-utils_0.8.90.bb | 23 - .../libmad/files/add-pkgconfig.patch | 68 - .../files/libmad-0.15.1b-avr32-optimization.patch | 2922 -------------------- .../libmad/files/mad-mips-h-constraint.patch | 70 - meta-oe/recipes-multimedia/libmad/files/mad.diff | 24 - .../libmad-0.15.1b/obsolete_automake_macros.patch | 14 - .../recipes-multimedia/libmad/libmad_0.15.1b.bb | 38 - .../packagegroup-qte-toolchain-target.bbappend | 6 - 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 - 10 files changed, 3177 deletions(-) delete mode 100644 meta-oe/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb delete mode 100644 meta-oe/recipes-multimedia/libmad/files/add-pkgconfig.patch delete mode 100644 meta-oe/recipes-multimedia/libmad/files/libmad-0.15.1b-avr32-optimization.patch delete mode 100644 meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch delete mode 100644 meta-oe/recipes-multimedia/libmad/files/mad.diff delete mode 100644 meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch delete mode 100644 meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb delete mode 100644 meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend 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
Signature · 1 line
1.7.10.4
PATCH 1/4 libmad: remove
This is largely equivalent to the recipe in OE-Core apart from LICENSE_FLAGS, insignificant patch differences, and an additional patch for avr32 optimisation (and since there appears to be no public layer for an avr32 machine, there's not a great deal of point in preserving the latter).
--- .../libmad/files/add-pkgconfig.patch | 68 - .../files/libmad-0.15.1b-avr32-optimization.patch | 2922 -------------------- .../libmad/files/mad-mips-h-constraint.patch | 70 - meta-oe/recipes-multimedia/libmad/files/mad.diff | 24 - .../libmad-0.15.1b/obsolete_automake_macros.patch | 14 - .../recipes-multimedia/libmad/libmad_0.15.1b.bb | 38 - 6 files changed, 3136 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libmad/files/add-pkgconfig.patch delete mode 100644 meta-oe/recipes-multimedia/libmad/files/libmad-0.15.1b-avr32-optimization.patch delete mode 100644 meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch delete mode 100644 meta-oe/recipes-multimedia/libmad/files/mad.diff delete mode 100644 meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch delete mode 100644 meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
meta-oe/recipes-multimedia/libmad/files/add-pkgconfig.patch deleted +0 -68
@@ -1,68 +0,0 @@ -Here is a patch for adding pkg-config support to libmad. -It would make life a bit easier for distro maintainers if this was applied. -In case you didn't know, pkg-config is a tool for providing LDFLAGS and -CFLAGS for packages using shared libraries. It's on freedesktop.org. -Debian has already been distributing the pkg-config file mad.pc with -libmad for some time, and people developing on debian (notably xmms2 -developers) have started relying on this support being present, causing -some confusion for people installing from source and on some BSDs which -do not provide mad.pc (google: pkgconfig libmad). - -EMH - ---h31gzZEtNLTqOjlF -Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename="libmad-0.15.1b-pkgconfig.patch" - -diff -Naur libmad-0.15.1b.old/configure.ac libmad-0.15.1b/configure.ac ---- libmad-0.15.1b.old/configure.ac 2004-01-23 10:41:32.000000000 +0100 -+++ libmad-0.15.1b/configure.ac 2004-08-07 02:25:24.633462168 +0200 -@@ -429,5 +429,5 @@ - dnl AC_SUBST(LTLIBOBJS) - - AC_CONFIG_FILES([Makefile msvc++/Makefile \ -- libmad.list]) -+ libmad.list mad.pc]) - AC_OUTPUT -diff -Naur libmad-0.15.1b.old/mad.pc.in libmad-0.15.1b/mad.pc.in ---- libmad-0.15.1b.old/mad.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ libmad-0.15.1b/mad.pc.in 2004-08-07 02:04:59.617692872 +0200 -@@ -0,0 +1,14 @@ -+# libmad pkg-config source file -+ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: mad -+Description: MPEG Audio Decoder -+Version: @VERSION@ -+Requires: -+Conflicts: -+Libs: -L${libdir} -lmad -lm -+Cflags: -I${includedir} -diff -Naur libmad-0.15.1b.old/Makefile.am libmad-0.15.1b/Makefile.am ---- libmad-0.15.1b.old/Makefile.am 2004-02-17 03:02:03.000000000 +0100 -+++ libmad-0.15.1b/Makefile.am 2004-08-07 02:03:19.859858368 +0200 -@@ -24,6 +24,9 @@ - SUBDIRS = - DIST_SUBDIRS = msvc++ - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = mad.pc -+ - lib_LTLIBRARIES = libmad.la - include_HEADERS = mad.h - -@@ -34,7 +37,8 @@ - minimad_LDADD = libmad.la - - EXTRA_DIST = mad.h.sed \ -- CHANGES COPYRIGHT CREDITS README TODO VERSION -+ CHANGES COPYRIGHT CREDITS README TODO VERSION \ -+ mad.pc.in - - exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ - synth.h decoder.h -
meta-oe/recipes-multimedia/libmad/files/libmad-0.15.1b-avr32-optimization.patch deleted +0 -2922
2,922 lines not on this page · raw message
meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch deleted +0 -70
10 lines not on this page · raw message
meta-oe/recipes-multimedia/libmad/files/mad.diff deleted +0 -24
Lines of this file are not shown. View the raw message.
meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch deleted +0 -14
Lines of this file are not shown. View the raw message.
meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb deleted +0 -38
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.10.4
Part of the diff is not shown here. View the raw message.
PATCH 2/4 icon-naming-utils: remove
In reply to Paul EggletonThis version is now in OE-Core.
--- .../icon-naming-utils/icon-naming-utils_0.8.90.bb | 23 -------------------- 1 file changed, 23 deletions(-) delete mode 100644 meta-oe/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
meta-oe/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb deleted +0 -23
@@ -1,23 +0,0 @@ -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "libxml-simple-perl-native" - -PR = "r3" - -SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-${PV}.tar.gz" -SRC_URI[md5sum] = "2c5c7a418e5eb3268f65e21993277fba" -SRC_URI[sha256sum] = "044ab2199ed8c6a55ce36fd4fcd8b8021a5e21f5bab028c0a7cdcf52a5902e1c" - -S = "${WORKDIR}/icon-naming-utils-${PV}" - -inherit autotools allarch perlnative - -do_configure_append() { - # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl - sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/icon-name-mapping.pl.in -} - -FILES_${PN} += "${datadir}/dtds" - -BBCLASSEXTEND = "native"
Signature · 1 line
1.7.10.4
PATCH 3/4 packagegroup-qte-toolchain-target: remove bbappend
In reply to Paul EggletonThis 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.
--- .../packagegroups/packagegroup-qte-toolchain-target.bbappend | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend deleted +0 -6
@@ -1,6 +0,0 @@ -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}"
Signature · 1 line
1.7.10.4
PATCH 4/4 qt4: remove bbappends
In reply to Paul EggletonThese changes to Qt's configuration need to be applied in distro layers, not in meta-oe.
--- 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
meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend deleted +0 -6
@@ -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}"
meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend deleted +0 -6
@@ -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}"
Signature · 1 line
1.7.10.4
Otavio Salvador
NAKRe: [meta-oe][PATCH 4/4] qt4: remove bbappends
Quoted 4 lines · Paul Eggleton
These changes to Qt's configuration need to be applied in distro layers, not in meta-oe.
Signed-off-by Paul Eggleton <[email protected]>
NACK!
Keep PRINC as otherwise revision will go backwards.
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Otavio Salvador
NAKRe: [meta-oe][PATCH 3/4] packagegroup-qte-toolchain-target: remove bbappend
In reply to Paul EggletonQuoted 6 lines · 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.
Signed-off-by Paul Eggleton <[email protected]>
NACK
Keep PRINC please.
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [meta-oe][PATCH 1/4] libmad: remove
In reply to Paul EggletonQuoted 7 lines · Paul Eggleton
This is largely equivalent to the recipe in OE-Core apart from
LICENSE_FLAGS, insignificant patch differences, and an additional patch for avr32 optimisation (and since there appears to be no public layer for an avr32 machine, there's not a great deal of point in preserving the latter).Signed-off-by Paul Eggleton <[email protected]>
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [meta-oe][PATCH 2/4] icon-naming-utils: remove
In reply to Paul EggletonQuoted 3 lines · Paul Eggleton
This version is now in OE-Core.
Signed-off-by Paul Eggleton <[email protected]>
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 1 line · Paul Eggleton
Drop some items that should no longer be in meta-oe.
The Qt ones need to be reworked to keep the upgrade path. I replied accordingly.
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [meta-oe][PATCH 4/4] qt4: remove bbappends
In reply to Otavio SalvadorQuoted 10 lines · On Saturday 06 April 2013 10:36:41 Otavio Salvador wrote:
Quoted 4 lines · Paul Eggleton
These changes to Qt's configuration need to be applied in distro layers, not in meta-oe.
Signed-off-by Paul Eggleton <[email protected]>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
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Re: [meta-oe][PATCH 4/4] qt4: remove bbappends
Quoted 6 lines · Paul Eggleton
Quoted 5 lines · On Saturday 06 April 2013 10:36:41 Otavio Salvador wrote:
Quoted 3 lines · Paul Eggleton
These changes to Qt's configuration need to be applied in distro layers, not in meta-oe.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Paul Eggleton <[email protected]>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: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br