Skip to contentSkip to conversation

Fix some recipes check upstream version issue

PATCH In review Mei Lei 3 participants 5 messages Dec 1, 2011 – Dec 6, 2011

lore
Share & tools
lore

Mei Lei

author
#0 lore raw

cover Fix some recipes check upstream version issue

Hi all,
Some recipes(like rt-tests,clutter-box2d,iproute2) didn't check the right upstream version because lack of protocal declaration. Fix this by add their upstream protocal at the end of SRC_URI.

Thanks,
Lei

The following changes since commit f4efaa0f472b4bf0ba0a0297cc9ecc8b5a671f72:
Martin Jansa (1):
squashfs-tools: fix PR, those should start with 'r'

are available in the git repository at:

git://git.pokylinux.org/poky-contrib lmei3/fix-upver-check
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/fix-upver-check

Mei Lei (1):
Fix some recipes upstream version check issue

 .../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(-)
author
#1 lore raw

PATCH 1/1 Fix some recipes upstream version check issue

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 <[email protected]>
---
 .../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(-)
meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb +1 -1
index 0b47046..52e40e1 100644
@@ -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"
meta/recipes-graphics/clutter/clutter-box2d_git.bb +1 -1
index 554ce81..7a1dc8e 100644
@@ -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"
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +1 -1
index 78d51b3..7e64032 100644
@@ -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"
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 1/1] Fix some recipes upstream version check issue

Op 1 dec. 2011, om 09:54 heeft Mei Lei het volgende geschreven:

Quoted 4 lines

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 <[email protected]>

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

regards,

Koen

#3 lore raw

Re: [PATCH 1/1] Fix some recipes upstream version check issue

In reply to Mei Lei
Quoted 2 lines · Mei Lei

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

Quoted 46 lines
Signed-off-by Mei Lei <[email protected]>
---
 .../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(-)
meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb +1 -1
index 0b47046..52e40e1 100644
@@ -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"
meta/recipes-graphics/clutter/clutter-box2d_git.bb +1 -1
index 554ce81..7a1dc8e 100644
@@ -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"
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +1 -1
index 78d51b3..7e64032 100644
@@ -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"
author
#4 lore raw

Re: [PATCH 1/1] Fix some recipes upstream version check issue

Quoted 20 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Richard Purdie
Sent: Thursday, December 01, 2011 5:22 PM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 1/1] Fix some recipes upstream version check issue

Quoted 1 line · Mei Lei

Some recipes didn't declare what protocal they use to check the upstream

version, this will due to some errors.

Quoted 1 line

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:

Quoted 7 lines

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

Quoted 67 lines

?

Cheers,

Richard

Review

Quoted 8 lines
Signed-off-by Mei Lei <[email protected]>
---
 .../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(-)
(quoted diff) +0 -0

b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb

meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb require iproute2.inc · line 5

Quoted 8 lines

index 0b47046..52e40e1 100644

meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb +0 -1
@@ -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 \

meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb require iproute2.inc · line 5

Quoted 1 line
meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb +1 -0
+SRC_URI =

"git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;protoco l=git \

Review

Quoted 4 lines
meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb +0 -0
            file://configure-cross.patch"
 S = "${WORKDIR}/git"
(quoted diff) +0 -0

b/meta/recipes-graphics/clutter/clutter-box2d_git.bb

meta/recipes-graphics/clutter/clutter-box2d_git.bb SRCREV =

Quoted 4 lines

index 554ce81..7a1dc8e 100644

meta/recipes-graphics/clutter/clutter-box2d_git.bb +0 -0
@@ -6,7 +6,7 @@ SRCREV =

"de5452e56b537a11fd7f9453d048ff4b4793b5a2"

Review

Quoted 9 lines
meta/recipes-graphics/clutter/clutter-box2d_git.bb +1 -1
 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"
(quoted diff) +0 -0

b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb

meta/recipes-rt/rt-tests/rt-tests_0.83.bb SRCREV =

Quoted 4 lines

index 78d51b3..7e64032 100644

meta/recipes-rt/rt-tests/rt-tests_0.83.bb +0 -0
@@ -12,7 +12,7 @@ SRCREV =

"5f1e84f8b015df3ff950056494134eca3f640d70"

meta/recipes-rt/rt-tests/rt-tests_0.83.bb SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70" · line 18

Quoted 8 lines
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +1 -1
 # 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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core