Patchwork [1/1] Fix some recipes upstream version check issue

login
register
mail settings
Submitter Mei Lei
Date Dec. 1, 2011, 8:54 a.m.
Message ID <ec329e79d07e83cb240dda3988017741c597b566.1322729357.git.lei.mei@intel.com>
Download mbox | patch
Permalink /patch/15951/
State New
Headers show

Comments

Mei Lei - Dec. 1, 2011, 8:54 a.m.
Some recipes didn't declare what protocal they use to check the upstream version, this will due to some errors.
Fix this by add the protocal at the end of the SRC_URI.

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 .../iproute2/iproute2_3.1.0.bb                     |    2 +-
 meta/recipes-graphics/clutter/clutter-box2d_git.bb |    2 +-
 meta/recipes-rt/rt-tests/rt-tests_0.83.bb          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Koen Kooi - Dec. 1, 2011, 9:21 a.m.
Op 1 dec. 2011, om 09:54 heeft Mei Lei het volgende geschreven:

> Some recipes didn't declare what protocal they use to check the upstream version, this will due to some errors.
> Fix this by add the protocal at the end of the SRC_URI.
> 
> Signed-off-by: Mei Lei <lei.mei@intel.com>

Which version of bitbake are you usung? IIRC the default was changed from rsync to git a few weeks ago.

regards,

Koen
Richard Purdie - Dec. 1, 2011, 9:22 a.m.
On Thu, 2011-12-01 at 16:54 +0800, Mei Lei wrote:
> Some recipes didn't declare what protocal they use to check the upstream version, this will due to some errors.
> Fix this by add the protocal at the end of the SRC_URI.

What errors does this give? We should be defaulting to git these days.
lib/bb/fetch2/git.py says:

        if 'protocol' in ud.parm:
            ud.proto = ud.parm['protocol']
        elif not ud.host:
            ud.proto = 'file'
        else:
            ud.proto = "git"

?

Cheers,

Richard

> Signed-off-by: Mei Lei <lei.mei@intel.com>
> ---
>  .../iproute2/iproute2_3.1.0.bb                     |    2 +-
>  meta/recipes-graphics/clutter/clutter-box2d_git.bb |    2 +-
>  meta/recipes-rt/rt-tests/rt-tests_0.83.bb          |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
> index 0b47046..52e40e1 100644
> --- a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
> +++ b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
> @@ -2,7 +2,7 @@ require iproute2.inc
>  
>  #v3.1.0 tag
>  SRCREV = "9cbe6bc337a35b91882f92599eefeb161f3e776e"
> -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
> +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;protocol=git \
>             file://configure-cross.patch"
>  S = "${WORKDIR}/git"
>  
> diff --git a/meta/recipes-graphics/clutter/clutter-box2d_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
> index 554ce81..7a1dc8e 100644
> --- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
> +++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
> @@ -6,7 +6,7 @@ SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2"
>  PV = "0.12.1+git${SRCPV}"
>  PR = "r0"
>  
> -SRC_URI = "git://git.gnome.org/clutter-box2d.git"
> +SRC_URI = "git://git.gnome.org/clutter-box2d.git;protocol=git"
>  
>  S = "${WORKDIR}/git"
>  
> diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> index 78d51b3..7e64032 100644
> --- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> +++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> @@ -12,7 +12,7 @@ SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
>  # git -> 0.83 needs a PE bump
>  PE = "1"
>  
> -SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
> +SRC_URI = "git://github.com/clrkwllms/rt-tests.git;protocol=git"
>  
>  S = "${WORKDIR}/git"
>
Mei Lei - Dec. 6, 2011, 9:15 a.m.
>-----Original Message-----
>From: openembedded-core-bounces@lists.openembedded.org
>[mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
>Richard Purdie
>Sent: Thursday, December 01, 2011 5:22 PM
>To: Patches and discussions about the oe-core layer
>Cc: openembedded-core@openembedded.org
>Subject: Re: [OE-core] [PATCH 1/1] Fix some recipes upstream version check
>issue
>
>On Thu, 2011-12-01 at 16:54 +0800, Mei Lei wrote:
>> Some recipes didn't declare what protocal they use to check the upstream
>version, this will due to some errors.
>> Fix this by add the protocal at the end of the SRC_URI.
>
>What errors does this give? We should be defaulting to git these days.
>lib/bb/fetch2/git.py says:
>
>        if 'protocol' in ud.parm:
>            ud.proto = ud.parm['protocol']
>        elif not ud.host:
>            ud.proto = 'file'
>        else:
>            ud.proto = "git"
>

Oh, yes, but when check upstream version, we didn't use git.py, we still use rsync as the default protocol in distrodata.bbclass for those git recipes.
So I sent a new patch to change the default protocol in distrodata.bbclass:
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=lmei3/fix-protocal&id=2fba54d2f6ada2272efaf8cd50b137bb7d2eaf26

Please ignore this patch.
Thank you for your reminder.

Thanks,
Lei



>?
>
>Cheers,
>
>Richard
>
>> Signed-off-by: Mei Lei <lei.mei@intel.com>
>> ---
>>  .../iproute2/iproute2_3.1.0.bb                     |    2 +-
>>  meta/recipes-graphics/clutter/clutter-box2d_git.bb |    2 +-
>>  meta/recipes-rt/rt-tests/rt-tests_0.83.bb          |    2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
>b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
>> index 0b47046..52e40e1 100644
>> --- a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
>> +++ b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
>> @@ -2,7 +2,7 @@ require iproute2.inc
>>
>>  #v3.1.0 tag
>>  SRCREV = "9cbe6bc337a35b91882f92599eefeb161f3e776e"
>> -SRC_URI =
>"git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
>> +SRC_URI =
>"git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;protoco
>l=git \
>>             file://configure-cross.patch"
>>  S = "${WORKDIR}/git"
>>
>> diff --git a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
>b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
>> index 554ce81..7a1dc8e 100644
>> --- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
>> +++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
>> @@ -6,7 +6,7 @@ SRCREV =
>"de5452e56b537a11fd7f9453d048ff4b4793b5a2"
>>  PV = "0.12.1+git${SRCPV}"
>>  PR = "r0"
>>
>> -SRC_URI = "git://git.gnome.org/clutter-box2d.git"
>> +SRC_URI = "git://git.gnome.org/clutter-box2d.git;protocol=git"
>>
>>  S = "${WORKDIR}/git"
>>
>> diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> index 78d51b3..7e64032 100644
>> --- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> +++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> @@ -12,7 +12,7 @@ SRCREV =
>"5f1e84f8b015df3ff950056494134eca3f640d70"
>>  # git -> 0.83 needs a PE bump
>>  PE = "1"
>>
>> -SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
>> +SRC_URI = "git://github.com/clrkwllms/rt-tests.git;protocol=git"
>>
>>  S = "${WORKDIR}/git"
>>
>
>
>
>_______________________________________________
>Openembedded-core mailing list
>Openembedded-core@lists.openembedded.org
>http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
index 0b47046..52e40e1 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
@@ -2,7 +2,7 @@  require iproute2.inc
 
 #v3.1.0 tag
 SRCREV = "9cbe6bc337a35b91882f92599eefeb161f3e776e"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;protocol=git \
            file://configure-cross.patch"
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-graphics/clutter/clutter-box2d_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
index 554ce81..7a1dc8e 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
@@ -6,7 +6,7 @@  SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2"
 PV = "0.12.1+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://git.gnome.org/clutter-box2d.git"
+SRC_URI = "git://git.gnome.org/clutter-box2d.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
index 78d51b3..7e64032 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
@@ -12,7 +12,7 @@  SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
 # git -> 0.83 needs a PE bump
 PE = "1"
 
-SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
+SRC_URI = "git://github.com/clrkwllms/rt-tests.git;protocol=git"
 
 S = "${WORKDIR}/git"