Patchwork [2011.03-maintenance,v2,1/2] gnutls: update SRC_URI

login
register
mail settings
Submitter Apelete Seketeli
Date March 9, 2013, 12:38 p.m.
Message ID <73f5d1d2501d60fb20e3290d758e35aaf6b91e4c.1362831936.git.apelete@seketeli.net>
Download mbox | patch
Permalink /patch/45789/
State Superseded, archived
Headers show

Comments

Apelete Seketeli - March 9, 2013, 12:38 p.m.
Update SRC_URI since the gnutls source packages were moved into a
different directory on ftp.gnutls.org.
---
 recipes/gnutls/gnutls.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Khem Raj - March 9, 2013, 4:32 p.m.
On Mar 9, 2013, at 4:38 AM, Apelete Seketeli <apelete@seketeli.net> wrote:

> -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
> +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"

can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb
Khem Raj - March 9, 2013, 4:45 p.m.
On Mar 9, 2013, at 4:38 AM, Apelete Seketeli <apelete@seketeli.net> wrote:

> -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
> +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"

can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb
Apelete Seketeli - March 9, 2013, 7:54 p.m.
Le 09-Mar-13, Khem Raj a écrit:
> 
> On Mar 9, 2013, at 4:38 AM, Apelete Seketeli <apelete@seketeli.net> wrote:
> 
> > -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
> > +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"
> 
> can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb

PV is actually 2.10.4 here, it can't be used instead of 2.10 it seems.
I'll move SRC_URI into .bb then.
Khem Raj - March 9, 2013, 7:58 p.m.
On Mar 9, 2013, at 11:54 AM, Apelete Seketeli <apelete@seketeli.net> wrote:

> Le 09-Mar-13, Khem Raj a écrit:
>> 
>> On Mar 9, 2013, at 4:38 AM, Apelete Seketeli <apelete@seketeli.net> wrote:
>> 
>>> -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
>>> +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"
>> 
>> can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb
> 
> PV is actually 2.10.4 here, it can't be used instead of 2.10 it seems.
> I'll move SRC_URI into .bb then.

now that I looked into oe.classic tree there is only 1 recipe for gnutls
so its ok to have it in .inc 

> 
> -- 
>        Apelete
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Apelete Seketeli - March 9, 2013, 8:18 p.m.
Le 09-Mar-13, Khem Raj a écrit:
> 
> On Mar 9, 2013, at 11:54 AM, Apelete Seketeli <apelete@seketeli.net> wrote:
> 
> > Le 09-Mar-13, Khem Raj a écrit:
> >> 
> >> On Mar 9, 2013, at 4:38 AM, Apelete Seketeli <apelete@seketeli.net> wrote:
> >> 
> >>> -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
> >>> +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"
> >> 
> >> can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb
> > 
> > PV is actually 2.10.4 here, it can't be used instead of 2.10 it seems.
> > I'll move SRC_URI into .bb then.
> 
> now that I looked into oe.classic tree there is only 1 recipe for gnutls
> so its ok to have it in .inc 

Patch v3 already sent, I hope it's ok anyway :).

Cheers.
Martin Jansa - March 13, 2013, 5:04 p.m.
On Sat, Mar 09, 2013 at 08:54:24PM +0100, Apelete Seketeli wrote:
> Le 09-Mar-13, Khem Raj a écrit:
> > 
> > On Mar 9, 2013, at 4:38 AM, Apelete Seketeli <apelete@seketeli.net> wrote:
> > 
> > > -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
> > > +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"
> > 
> > can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb
> 
> PV is actually 2.10.4 here, it can't be used instead of 2.10 it seems.
> I'll move SRC_URI into .bb then.

In couple of recipes we're using:
SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
SRC_URI = "http://download.gnome.org/sources/${PN}/${SHRT_VER}/${PN}-${PV}.tar.gz"

This could be applied here too.
Apelete Seketeli - March 14, 2013, 9:43 a.m.
Le 13-Mar-13, Martin Jansa a écrit:
> On Sat, Mar 09, 2013 at 08:54:24PM +0100, Apelete Seketeli wrote:
> > Le 09-Mar-13, Khem Raj a écrit:
> > > 
> > > On Mar 9, 2013, at 4:38 AM, Apelete Seketeli <apelete@seketeli.net> wrote:
> > > 
> > > > -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
> > > > +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"
> > > 
> > > can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb
> > 
> > PV is actually 2.10.4 here, it can't be used instead of 2.10 it seems.
> > I'll move SRC_URI into .bb then.
> 
> In couple of recipes we're using:
> SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
> SRC_URI = "http://download.gnome.org/sources/${PN}/${SHRT_VER}/${PN}-${PV}.tar.gz"
> 
> This could be applied here too.

When I updated this SRC_URI I actually wondered if there was a way to
filter the version in a generic fashion, but couldn't come up with
any. This is it, thanks for the tip. I will fix SRC_URI in .inc then,
instead of moving it into .bb like I did.

Cheers.

Patch

diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc
index a8e1e0d..0e055e3 100644
--- a/recipes/gnutls/gnutls.inc
+++ b/recipes/gnutls/gnutls.inc
@@ -8,7 +8,7 @@  LICENSE_${PN}-bin = "GPLv3+"
 LICENSE_${PN}-extra = "GPLv3+"
 LICENSE_${PN}-openssl = "GPLv3+"
 
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
+SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"
 
 inherit autotools binconfig pkgconfig gettext