Patchwork eglic: Update the svn URL

login
register
mail settings
Submitter Damien Lespiau
Date July 17, 2012, 10:23 p.m.
Message ID <1342563792-17634-1-git-send-email-damien.lespiau@gmail.com>
Download mbox | patch
Permalink /patch/32323/
State New
Headers show

Comments

Damien Lespiau - July 17, 2012, 10:23 p.m.
From: Damien Lespiau <damien.lespiau@intel.com>

Apparently, you can't be checkout eglibc at this URL anymore:

STDERR: svn: E170000: URL 'svn://www.eglibc.org/svn/branches/eglibc-2_15' doesn't exist

eglibc.org does give http access to the repository, but you have to use
the http:// scheme.

So let's change both 2.15 and 2.16 recipes.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 meta/recipes-core/eglibc/eglibc_2.15.bb |    2 +-
 meta/recipes-core/eglibc/eglibc_2.16.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Martin Jansa - July 17, 2012, 10:28 p.m.
On Tue, Jul 17, 2012 at 11:23:12PM +0100, Damien Lespiau wrote:
> From: Damien Lespiau <damien.lespiau@intel.com>
> 
> Apparently, you can't be checkout eglibc at this URL anymore:
> 
> STDERR: svn: E170000: URL 'svn://www.eglibc.org/svn/branches/eglibc-2_15' doesn't exist
> 
> eglibc.org does give http access to the repository, but you have to use
> the http:// scheme.
> 
> So let's change both 2.15 and 2.16 recipes.

How did you test this change? svn:// is right (it's checkout from
subverion), what's wrong is your bitbake version not respecting
protocol=http param to checkout from subversion using http backend.

If you change SRC_URI to start with http:// then wget will be used to
download that and of course it will fail as there is no eglibc source on
http://www.eglibc.org/svn/branches url.

Cheers,

> 
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  meta/recipes-core/eglibc/eglibc_2.15.bb |    2 +-
>  meta/recipes-core/eglibc/eglibc_2.16.bb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
> index 110febf..16b3fa1 100644
> --- a/meta/recipes-core/eglibc/eglibc_2.15.bb
> +++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
> @@ -7,7 +7,7 @@ PR = "r12"
>  PR_append = "+svnr${SRCPV}"
>  
>  EGLIBC_BRANCH="eglibc-2_15"
> -SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
> +SRC_URI = "http://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
>             file://eglibc-svn-arm-lowlevellock-include-tls.patch \
>             file://IO-acquire-lock-fix.patch \
>             file://mips-rld-map-check.patch \
> diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
> index 09f5dbb..bec39cf 100644
> --- a/meta/recipes-core/eglibc/eglibc_2.16.bb
> +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
> @@ -7,7 +7,7 @@ PR = "r0"
>  PR_append = "+svnr${SRCPV}"
>  
>  EGLIBC_BRANCH="eglibc-2_16"
> -SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
> +SRC_URI = "http://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
>             file://eglibc-svn-arm-lowlevellock-include-tls.patch \
>             file://IO-acquire-lock-fix.patch \
>             file://mips-rld-map-check.patch \
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Phil Blundell - July 17, 2012, 10:29 p.m.
On Tue, 2012-07-17 at 23:23 +0100, Damien Lespiau wrote:
> -SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
> +SRC_URI = "http://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \

Er, really?  Isn't "protocol=http" enough to get the svn fetcher to use
http?  What version of bitbake do you have?

I'm slightly surprised that "http://" even works here since there is no
obvious clue to bitbake that it ought to be using svn for that URI.
Won't that just give you a download of the html index page? 

p.
Damien Lespiau - July 17, 2012, 10:38 p.m.
On 17 July 2012 23:29, Phil Blundell <philb@gnu.org> wrote:
> On Tue, 2012-07-17 at 23:23 +0100, Damien Lespiau wrote:
>> -SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
>> +SRC_URI = "http://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
>
> Er, really?  Isn't "protocol=http" enough to get the svn fetcher to use
> http?  What version of bitbake do you have?
>
> I'm slightly surprised that "http://" even works here since there is no
> obvious clue to bitbake that it ought to be using svn for that URI.
> Won't that just give you a download of the html index page?

Fair enough, the patch is then totally untested, guess it's a bit too
late to try to send anything. The actual tested change was:

svn://svn.eglibc.org/branches/$branch_name

and then went ahead and made false assumptions about how bitbake was
going to do with the URL.
What I have here:

$ svn co svn://www.eglibc.org/svn/branches/eglibc-2_16/
svn: E170000: URL 'svn://www.eglibc.org/svn/branches/eglibc-2_16' doesn't exist

$ svn co svn://www.eglibc.org/branches/eglibc-2_16/
A    eglibc-2_16/ports
A    eglibc-2_16/ports/ChangeLog.tile
A    eglibc-2_16/ports/ChangeLog.cris
[..]

$ svn co http://www.eglibc.org/svn/branches/eglibc-2_16/
A    eglibc-2_16/ports
A    eglibc-2_16/ports/ChangeLog.tile
A    eglibc-2_16/ports/ChangeLog.cris
[..]
Martin Jansa - July 17, 2012, 10:39 p.m.
On Wed, Jul 18, 2012 at 12:28:04AM +0200, Martin Jansa wrote:
> On Tue, Jul 17, 2012 at 11:23:12PM +0100, Damien Lespiau wrote:
> > From: Damien Lespiau <damien.lespiau@intel.com>
> > 
> > Apparently, you can't be checkout eglibc at this URL anymore:
> > 
> > STDERR: svn: E170000: URL 'svn://www.eglibc.org/svn/branches/eglibc-2_15' doesn't exist
> > 
> > eglibc.org does give http access to the repository, but you have to use
> > the http:// scheme.
> > 
> > So let's change both 2.15 and 2.16 recipes.
> 
> How did you test this change? svn:// is right (it's checkout from
> subverion), what's wrong is your bitbake version not respecting
> protocol=http param to checkout from subversion using http backend.
> 
> If you change SRC_URI to start with http:// then wget will be used to
> download that and of course it will fail as there is no eglibc source on
> http://www.eglibc.org/svn/branches url.

It's a bit worse.. this patch didn't make it to V2
http://patchwork.openembedded.org/patch/31617/

Apply this to your bitbake:
http://patchwork.openembedded.org/patch/32325/

Cheers,

> 
> Cheers,
> 
> > 
> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> > ---
> >  meta/recipes-core/eglibc/eglibc_2.15.bb |    2 +-
> >  meta/recipes-core/eglibc/eglibc_2.16.bb |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
> > index 110febf..16b3fa1 100644
> > --- a/meta/recipes-core/eglibc/eglibc_2.15.bb
> > +++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
> > @@ -7,7 +7,7 @@ PR = "r12"
> >  PR_append = "+svnr${SRCPV}"
> >  
> >  EGLIBC_BRANCH="eglibc-2_15"
> > -SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
> > +SRC_URI = "http://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
> >             file://eglibc-svn-arm-lowlevellock-include-tls.patch \
> >             file://IO-acquire-lock-fix.patch \
> >             file://mips-rld-map-check.patch \
> > diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
> > index 09f5dbb..bec39cf 100644
> > --- a/meta/recipes-core/eglibc/eglibc_2.16.bb
> > +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
> > @@ -7,7 +7,7 @@ PR = "r0"
> >  PR_append = "+svnr${SRCPV}"
> >  
> >  EGLIBC_BRANCH="eglibc-2_16"
> > -SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
> > +SRC_URI = "http://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
> >             file://eglibc-svn-arm-lowlevellock-include-tls.patch \
> >             file://IO-acquire-lock-fix.patch \
> >             file://mips-rld-map-check.patch \
> > -- 
> > 1.7.10.4
> > 
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
Damien Lespiau - July 17, 2012, 11:01 p.m.
On 17 July 2012 23:39, Martin Jansa <martin.jansa@gmail.com> wrote:
> It's a bit worse.. this patch didn't make it to V2
> http://patchwork.openembedded.org/patch/31617/

Ah, thanks! makes more sense now.

git grep helped as well to catch all the remaining instances (Vs
runtime warnings). btw, bitbake still has uses proto= and ">proto<" in
its manual :)

Patch

diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 110febf..16b3fa1 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -7,7 +7,7 @@  PR = "r12"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"
-SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
+SRC_URI = "http://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch \
            file://IO-acquire-lock-fix.patch \
            file://mips-rld-map-check.patch \
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 09f5dbb..bec39cf 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -7,7 +7,7 @@  PR = "r0"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_16"
-SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
+SRC_URI = "http://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch \
            file://IO-acquire-lock-fix.patch \
            file://mips-rld-map-check.patch \