Patchwork gypsy: removed gypsy from meta/recipes-connectivity

login
register
mail settings
Submitter Andrei Dinu
Date Oct. 4, 2012, 10:14 a.m.
Message ID <1349345672-803-1-git-send-email-andrei.adrianx.dinu@intel.com>
Download mbox | patch
Permalink /patch/37767/
State Accepted
Commit 7817d91970e204b8bc1b733b8a6dd86a48aa27be
Headers show

Comments

Andrei Dinu - Oct. 4, 2012, 10:14 a.m.
removed also entry from meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc

Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@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
Martin Jansa - Oct. 23, 2012, 6:54 p.m.
On Thu, Oct 18, 2012 at 10:59:48PM +0200, Martin Jansa wrote:
> 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"

ping

meta-oe is still broken because of this

Cheers,
Andrei Dinu - Oct. 24, 2012, 7:46 a.m.
Hi Martin,

This change was caused by the bug :

https://bugzilla.yoctoproject.org/show_bug.cgi?id=2797

I removed the tarball and kept only the git package because that is what 
says in the bug.

Secondly, i modified the SRCREV because i took the latest version in the 
git repo.

If there is anything more to add please send me an email.

Thanks,

Andrei Dinu

On 10/23/2012 09:54 PM, Martin Jansa wrote:
> On Thu, Oct 18, 2012 at 10:59:48PM +0200, Martin Jansa wrote:
>> 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"
> ping
>
> meta-oe is still broken because of this
>
> Cheers,
Martin Jansa - Oct. 24, 2012, 8 a.m.
On Wed, Oct 24, 2012 at 10:46:08AM +0300, Andrei Dinu wrote:
> Hi Martin,
> 
> This change was caused by the bug :
> 
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2797
> 
> I removed the tarball and kept only the git package because that is what 
> says in the bug.
> 
> Secondly, i modified the SRCREV because i took the latest version in the 
> git repo.

Hi,

So this SRCREV points to newer code then 0.9 now? Then you forgot to
update PV to say so.

That's why there is error about downgrading it.

Cheers,
 
> If there is anything more to add please send me an email.
> 
> Thanks,
> 
> Andrei Dinu
> 
> On 10/23/2012 09:54 PM, Martin Jansa wrote:
> > On Thu, Oct 18, 2012 at 10:59:48PM +0200, Martin Jansa wrote:
> >> 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"
> > ping
> >
> > meta-oe is still broken because of this
> >
> > Cheers,
>
Andrei Dinu - Oct. 24, 2012, 8:20 a.m.
The newer code points to :

commit be8c9c382d2d1d37b51d29b0843045121ec90213
Author: iain <iain@sleepfive.com>
Date:   Tue Aug 28 12:31:42 2012 +0100

     Configure automake to generate .gz and .bz2 archives

This is the latest commit in the gypsy git master branch.

Also, the lastest release is pointed here :
http://gypsy.freedesktop.org/releases/

and it is on the same date as the last commit in git.

I don't really know how git recipes work, do you suggest updating the PV ?

Andrei Dinu


On 10/24/2012 11:00 AM, Martin Jansa wrote:
> On Wed, Oct 24, 2012 at 10:46:08AM +0300, Andrei Dinu wrote:
>> Hi Martin,
>>
>> This change was caused by the bug :
>>
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2797
>>
>> I removed the tarball and kept only the git package because that is what
>> says in the bug.
>>
>> Secondly, i modified the SRCREV because i took the latest version in the
>> git repo.
> Hi,
>
> So this SRCREV points to newer code then 0.9 now? Then you forgot to
> update PV to say so.
>
> That's why there is error about downgrading it.
>
> Cheers,
>   
>> If there is anything more to add please send me an email.
>>
>> Thanks,
>>
>> Andrei Dinu
>>
>> On 10/23/2012 09:54 PM, Martin Jansa wrote:
>>> On Thu, Oct 18, 2012 at 10:59:48PM +0200, Martin Jansa wrote:
>>>> 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"
>>> ping
>>>
>>> meta-oe is still broken because of this
>>>
>>> Cheers,

Patch

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 \