Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org
Quoted 30 lines · On Wed, Feb 01, 2012 at 03:15:31PM +0000, [email protected] wrote:
Module: openembedded-core.git Branch: master Commit: b44717c29c4f50917570039adf896680d24bb216 URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b44717c29c4f50917570039adf896680d24bb216Author: Saul Wold <[email protected]> Date: Tue Jan 31 10:27:53 2012 -0800opkg-utils: convert to git repo at git.yoctoproject.org
The svn.openmoko.org site seems to have become unstable, make a copy and convert to git at git.yoctoproject.org to preserve history
[YOCTO #1867]
Signed-off-by Saul Wold <[email protected]>---
.../{opkg-utils_svn.bb => opkg-utils_git.bb} | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +0
-0
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ · line 10
Quoted 8 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +2
-3@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" RDEPENDS_${PN} = "python" RDEPENDS_${PN}_virtclass-native = "" -SRCREV = "4747" -PV = "0.1.8+svnr${SRCPV}" -PR = "r7" +SRCREV = "002d29bc605d7c2d02e4cf20a43c5277c15f5597" +PV = "0.1.8+git${SRCPV}"
Should this be +git or +gitr?
in OE-classic we have mostly +gitr, +git is used only without SRCPV:
OE @ ~/oe $ git grep "+git\\$" | wc -l
22
OE @ ~/oe $ git grep "+gitr\\$" | wc -l
368
meta-oe has always +gitr:
OE @ ~/meta-openembedded $ git grep "+gitr\\$" | wc -l 24
OE @ ~/meta-openembedded $ git grep "+git\\$" | wc -l 0
and oe-core has mostly +git:
OE @ ~/openembedded-core $ git grep "+gitr\\$" | wc -l 9
OE @ ~/openembedded-core $ git grep "+git\\$" | wc -l 78
It's only cosmetics but we should use one format if possible.
http://www.yoctoproject.org/docs/current/poky-ref-manual/poky-ref-manual.html
doesn't say anything about SRCPV (only SRCREV) so nothing about prefered +git(r).
BTW: there are also 2 recipes not using SRCPV meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb:PV = "2.0.pre11+git${SRCREV}" meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb:PV = "v2.0.pre16+git${SRCREV}" 1 in meta-oe
meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb:PV = "3.4.0-${PR}+gitr${SRCREV}"
Cheers,
Quoted 22 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +3
-2+PR = "r0" -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ +SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \ file://index-ignore-filenotfound.patch \ file://mtime-int.patch \ file://add-license-field.patch \@@ -18,7 +18,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ file://shebang.patch \ " -S = "${WORKDIR}/opkg-utils" +S = "${WORKDIR}/git" # Avoid circular dependencies from package_ipk.bbclass PACKAGES_virtclass-native = ""_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 33 lines · Martin Jansa
Quoted 32 lines · On Wed, Feb 01, 2012 at 03:15:31PM +0000, [email protected] wrote:
Module: openembedded-core.git Branch: master Commit: b44717c29c4f50917570039adf896680d24bb216 URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b44717c29c4f50917570039adf896680d24bb216Author: Saul Wold<[email protected]> Date: Tue Jan 31 10:27:53 2012 -0800opkg-utils: convert to git repo at git.yoctoproject.org
The svn.openmoko.org site seems to have become unstable, make a copy and convert to git at git.yoctoproject.org to preserve history
[YOCTO #1867]
Signed-off-by Saul Wold<[email protected]>---
.../{opkg-utils_svn.bb => opkg-utils_git.bb} | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +0
-0@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" RDEPENDS_${PN} = "python"
Quoted 9 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ · line 10
Quoted 6 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +2
-3RDEPENDS_${PN}_virtclass-native = "" -SRCREV = "4747" -PV = "0.1.8+svnr${SRCPV}" -PR = "r7" +SRCREV = "002d29bc605d7c2d02e4cf20a43c5277c15f5597" +PV = "0.1.8+git${SRCPV}"Should this be +git or +gitr?
I believe that ultimately it should be +git, but we can't just changes these as it will cause the PV to go backwards. I would suggest that as we move forward and PV's get updated we can move to +git instead of +gitr for oe-core
I would suggest the same for meta-oe and as we migrate other recipes from OE-classic and update PV they get converted.
Sau!
Quoted 61 lines
in OE-classic we have mostly +gitr, +git is used only without SRCPV:
OE @ ~/oe $ git grep "+git\\$" | wc -l
22
OE @ ~/oe $ git grep "+gitr\\$" | wc -l
368meta-oe has always +gitr:
OE @ ~/meta-openembedded $ git grep "+gitr\\$" | wc -l 24
OE @ ~/meta-openembedded $ git grep "+git\\$" | wc -l 0and oe-core has mostly +git:
OE @ ~/openembedded-core $ git grep "+gitr\\$" | wc -l 9
OE @ ~/openembedded-core $ git grep "+git\\$" | wc -l 78It's only cosmetics but we should use one format if possible.
http://www.yoctoproject.org/docs/current/poky-ref-manual/poky-ref-manual.html
doesn't say anything about SRCPV (only SRCREV) so nothing about prefered +git(r).BTW: there are also 2 recipes not using SRCPV meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb:PV = "2.0.pre11+git${SRCREV}" meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb:PV = "v2.0.pre16+git${SRCREV}" 1 in meta-oe
meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb:PV = "3.4.0-${PR}+gitr${SRCREV}"Cheers,
Quoted 18 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +3
-2+PR = "r0" -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ +SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \ file://index-ignore-filenotfound.patch \ file://mtime-int.patch \ file://add-license-field.patch \@@ -18,7 +18,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ file://shebang.patch \ " -S = "${WORKDIR}/opkg-utils" +S = "${WORKDIR}/git" # Avoid circular dependencies from package_ipk.bbclass PACKAGES_virtclass-native = ""Quoted 4 lines
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Quoted 43 lines · Saul Wold
Quoted 33 lines · Martin Jansa
Quoted 32 lines · On Wed, Feb 01, 2012 at 03:15:31PM +0000, [email protected] wrote:
Module: openembedded-core.git Branch: master Commit: b44717c29c4f50917570039adf896680d24bb216 URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b44717c29c4f50917570039adf896680d24bb216Author: Saul Wold<[email protected]> Date: Tue Jan 31 10:27:53 2012 -0800opkg-utils: convert to git repo at git.yoctoproject.org
The svn.openmoko.org site seems to have become unstable, make a copy and convert to git at git.yoctoproject.org to preserve history
[YOCTO #1867]
Signed-off-by Saul Wold<[email protected]>---
.../{opkg-utils_svn.bb => opkg-utils_git.bb} | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +0
-0@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" RDEPENDS_${PN} = "python"Quoted 9 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ · line 10
Quoted 6 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +2
-3RDEPENDS_${PN}_virtclass-native = "" -SRCREV = "4747" -PV = "0.1.8+svnr${SRCPV}" -PR = "r7" +SRCREV = "002d29bc605d7c2d02e4cf20a43c5277c15f5597" +PV = "0.1.8+git${SRCPV}"Should this be +git or +gitr?
Quoted 4 lines
I believe that ultimately it should be +git, but we can't just changes these as it will cause the PV to go backwards. I would suggest that as we move forward and PV's get updated we can move to +git instead of +gitr for oe-core
Why +git when we have +svnr not +svn? and both systems call it revision?
Wouldn't it be more consistent to use +gitr and then also we wouldn't have this problem with PV going backwards..
I've another 137 recipes with +gitr in meta-smartphone where I'm not going to wait for PV change..
Cheers,
Quoted 66 lines
I would suggest the same for meta-oe and as we migrate other recipes from OE-classic and update PV they get converted.
Sau!
Quoted 61 lines
in OE-classic we have mostly +gitr, +git is used only without SRCPV:
OE @ ~/oe $ git grep "+git\\$" | wc -l
22
OE @ ~/oe $ git grep "+gitr\\$" | wc -l
368meta-oe has always +gitr:
OE @ ~/meta-openembedded $ git grep "+gitr\\$" | wc -l 24
OE @ ~/meta-openembedded $ git grep "+git\\$" | wc -l 0and oe-core has mostly +git:
OE @ ~/openembedded-core $ git grep "+gitr\\$" | wc -l 9
OE @ ~/openembedded-core $ git grep "+git\\$" | wc -l 78It's only cosmetics but we should use one format if possible.
http://www.yoctoproject.org/docs/current/poky-ref-manual/poky-ref-manual.html
doesn't say anything about SRCPV (only SRCREV) so nothing about prefered +git(r).BTW: there are also 2 recipes not using SRCPV meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb:PV = "2.0.pre11+git${SRCREV}" meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb:PV = "v2.0.pre16+git${SRCREV}" 1 in meta-oe
meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb:PV = "3.4.0-${PR}+gitr${SRCREV}"Cheers,
Quoted 18 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +3
-2+PR = "r0" -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ +SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \ file://index-ignore-filenotfound.patch \ file://mtime-int.patch \ file://add-license-field.patch \@@ -18,7 +18,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ file://shebang.patch \ " -S = "${WORKDIR}/opkg-utils" +S = "${WORKDIR}/git" # Avoid circular dependencies from package_ipk.bbclass PACKAGES_virtclass-native = ""Quoted 4 lines
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 1 line · Martin Jansa
Why +git when we have +svnr not +svn? and both systems call it revision?
yes +${SCM}r seems more prevalent
Quoted 44 lines · Martin Jansa
Quoted 43 lines · Saul Wold
Quoted 42 lines · Martin Jansa
Quoted 30 lines · On Wed, Feb 01, 2012 at 03:15:31PM +0000, [email protected] wrote:
Module: openembedded-core.git Branch: master Commit: b44717c29c4f50917570039adf896680d24bb216 URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b44717c29c4f50917570039adf896680d24bb216Author: Saul Wold<[email protected]> Date: Tue Jan 31 10:27:53 2012 -0800opkg-utils: convert to git repo at git.yoctoproject.org
The svn.openmoko.org site seems to have become unstable, make a copy and convert to git at git.yoctoproject.org to preserve history
[YOCTO #1867]
Signed-off-by Saul Wold<[email protected]>---
.../{opkg-utils_svn.bb => opkg-utils_git.bb} | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +0
-0meta/recipes-devtools/opkg-utils/opkg-utils_git.bb LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ · line 10
Quoted 8 lines
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb renamed from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +2
-3@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" RDEPENDS_${PN} = "python" RDEPENDS_${PN}_virtclass-native = "" -SRCREV = "4747" -PV = "0.1.8+svnr${SRCPV}" -PR = "r7" +SRCREV = "002d29bc605d7c2d02e4cf20a43c5277c15f5597" +PV = "0.1.8+git${SRCPV}"Should this be +git or +gitr?
Quoted 6 lines
Quoted 4 lines
I believe that ultimately it should be +git, but we can't just changes these as it will cause the PV to go backwards. I would suggest that as we move forward and PV's get updated we can move to +git instead of +gitr for oe-core
Why +git when we have +svnr not +svn? and both systems call it revision?
In svn, the syntax was always "rXXX" so you could tell it was a revision that was being referred to rather than something else (e.g. a date) and the convention carried to the version naming. In git, its kind of obvious its the hash but in some cases we've carried the "r" along.
Quoted 5 lines
Wouldn't it be more consistent to use +gitr and then also we wouldn't have this problem with PV going backwards..
I've another 137 recipes with +gitr in meta-smartphone where I'm not going to wait for PV change..
I'm tempted to recommend "git" and let "gitr" die out, it looks like some kind of special version of git and doesn't add anything. Its not wrong but its not particularly useful either. The point about PV going backwards is a pain and is the main thing stopping me suggesting we just use "git" everywhere right now...
Cheers,
Richard
Quoted 4 lines · Martin Jansa
Why +git when we have +svnr not +svn? and both systems call it revision?
Wouldn't it be more consistent to use +gitr and then also we wouldn't have this problem with PV going backwards..
The "svnrNNNN" name came about because the Subversion convention is that revisions are always named "r1982" or whatever. Git doesn't do that, it just uses the hash directly, so it would be more natural to just write "+gitNNNNN". Adding an extra "r" in there doesn't contribute any useful information.
All that said, though, this seems like a fairly trivial issue and I don't think there is any good reason to go around changing existing recipes just to "fix" the version strings.
p.