On Thu, Oct 18, 2012 at 08:59:19PM +0200, Martin Jansa wrote: > I know you've sent > http://patchwork.openembedded.org/patch/37763/ > to add it to meta-oe, but this patch removed also newer gypsy_0.9.bb > and only older gypsy_git.bb was added back. > > Please fix that.
There is also this diff which isn't mentioned in your commit.
-SRCREV = "3652e1f37e82b8e63983e30fda3482cd099a8cf5"
+SRCREV = "be8c9c382d2d1d37b51d29b0843045121ec90213"
PV = "0.8+git${SRCPV}"
PR = "r2"
@@ -15,4 +15,5 @@
file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd"
SRC_URI = "git://anongit.freedesktop.org/gypsy;protocol=git \
- file://fixups.patch"
+ file://fixups.patch \
+ file://0001-gypsy-m4-directory-missing-from-structure.patch"
>
> On Thu, Oct 4, 2012 at 12:14 PM, Andrei Dinu
> <andrei.adrianx.d...@intel.com> wrote:
> > removed also entry from
> > meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
> >
> > Signed-off-by: Andrei Dinu <andrei.adrianx.d...@intel.com>
> > ---
> > meta/recipes-connectivity/gypsy/files/fixups.patch | 21 -----------------
> > meta/recipes-connectivity/gypsy/gypsy.inc | 15 ------------
> > meta/recipes-connectivity/gypsy/gypsy_0.9.bb | 24
> > --------------------
> > meta/recipes-connectivity/gypsy/gypsy_git.bb | 18 ---------------
> > .../packagegroups/packagegroup-sdk-gmae.inc | 1 -
> > 5 files changed, 79 deletions(-)
> > delete mode 100644 meta/recipes-connectivity/gypsy/files/fixups.patch
> > delete mode 100644 meta/recipes-connectivity/gypsy/gypsy.inc
> > delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_0.9.bb
> > delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_git.bb
> >
> > diff --git a/meta/recipes-connectivity/gypsy/files/fixups.patch
> > b/meta/recipes-connectivity/gypsy/files/fixups.patch
> > deleted file mode 100644
> > index de4d92e..0000000
> > --- a/meta/recipes-connectivity/gypsy/files/fixups.patch
> > +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -Upstream-Status: Inappropriate [configuration]
> > -
> > ----
> > - docs/reference/Makefile.am | 2 ++
> > - 1 file changed, 2 insertions(+)
> > -
> > ---- gypsy.orig/docs/reference/Makefile.am
> > -+++ gypsy/docs/reference/Makefile.am
> > -@@ -81,10 +81,12 @@ expand_content_files=
> > - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
> > -
> > - INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS)
> > - GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS)
> > -
> > -+EXTRA_DIST =
> > -+CLEANFILES =
> > - # This includes the standard gtk-doc make rules, copied by gtkdocize.
> > - include $(top_srcdir)/gtk-doc.make
> > -
> > - # Other files to distribute
> > - # e.g. EXTRA_DIST += version.xml.in
> > diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc
> > b/meta/recipes-connectivity/gypsy/gypsy.inc
> > deleted file mode 100644
> > index 0c1735e..0000000
> > --- a/meta/recipes-connectivity/gypsy/gypsy.inc
> > +++ /dev/null
> > @@ -1,15 +0,0 @@
> > -SUMMARY = "GPS Multiplexing Daemon"
> > -DESCRIPTION = "Gypsy is a GPS multiplexing daemon which allows \
> > -multiple clients to access GPS data from multiple GPS sources \
> > -concurrently. Gypsy also hides the details of parsing NMEA from the \
> > -client applications, passing the data as simple values for the clients \
> > -to use."
> > -LICENSE = "GPLv2.0 & LGPLv2.1"
> > -SECTION = "x11"
> > -DEPENDS = "glib-2.0 dbus bluez4 dbus-glib"
> > -
> > -inherit autotools pkgconfig gtk-doc
> > -
> > -EXTRA_OECONF += "--with-distro=debian"
> > -
> > -FILES_${PN} += "/usr/share/dbus-1/services/"
> > diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb
> > b/meta/recipes-connectivity/gypsy/gypsy_0.9.bb
> > deleted file mode 100644
> > index 51207c9..0000000
> > --- a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb
> > +++ /dev/null
> > @@ -1,24 +0,0 @@
> > -SUMMARY = "GPS Multiplexing Daemon"
> > -DESCRIPTION = "Gypsy is a GPS multiplexing daemon which allows \
> > -multiple clients to access GPS data from multiple GPS sources \
> > -concurrently. Gypsy also hides the details of parsing NMEA from the \
> > -client applications, passing the data as simple values for the clients \
> > -to use."
> > -LICENSE = "GPLv2+ & LGPLv2+"
> > -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
> > -
> > file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \
> > -
> > file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd
> > \
> > -
> > file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd"
> > -
> > -SECTION = "x11"
> > -DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt"
> > -
> > -SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz";
> > -PR = "r1"
> > -
> > -inherit autotools pkgconfig
> > -
> > -FILES_${PN} += "/usr/share/dbus-1/system-services/"
> > -
> > -SRC_URI[md5sum] = "e2d186df9c2cc3b70a027043e22acf1a"
> > -SRC_URI[sha256sum] =
> > "14e1cbe17351f408538e033ca370b4bf51ccf9c88744e236ddfb271904f154d6"
> > diff --git a/meta/recipes-connectivity/gypsy/gypsy_git.bb
> > b/meta/recipes-connectivity/gypsy/gypsy_git.bb
> > deleted file mode 100644
> > index 867582d..0000000
> > --- a/meta/recipes-connectivity/gypsy/gypsy_git.bb
> > +++ /dev/null
> > @@ -1,18 +0,0 @@
> > -require gypsy.inc
> > -
> > -DEFAULT_PREFERENCE = "-1"
> > -
> > -SRCREV = "3652e1f37e82b8e63983e30fda3482cd099a8cf5"
> > -PV = "0.8+git${SRCPV}"
> > -PR = "r2"
> > -
> > -S = "${WORKDIR}/git"
> > -
> > -LICENSE = "GPLv2+ & LGPLv2+"
> > -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
> > -
> > file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \
> > -
> > file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd
> > \
> > -
> > file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd"
> > -
> > -SRC_URI = "git://anongit.freedesktop.org/gypsy;protocol=git \
> > - file://fixups.patch"
> > diff --git a/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
> > b/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
> > index 2289572..a6403fc 100644
> > --- a/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
> > +++ b/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
> > @@ -17,7 +17,6 @@ SDK-GMAE = " \
> > gupnp \
> > gupnp-av \
> > gupnp-tools \
> > - gypsy \
> > libart-lgpl \
> > libtelepathy \
> > pulseaudio \
> > --
> > 1.7.9.5
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
