* Re: [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org [not found] <20120201151531.BE60410330@opal> @ 2012-02-01 15:37 ` Martin Jansa 2012-02-09 22:07 ` Saul Wold 0 siblings, 1 reply; 6+ messages in thread From: Martin Jansa @ 2012-02-01 15:37 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 3627 bytes --] On Wed, Feb 01, 2012 at 03:15:31PM +0000, git@git.openembedded.org wrote: > Module: openembedded-core.git > Branch: master > Commit: b44717c29c4f50917570039adf896680d24bb216 > URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b44717c29c4f50917570039adf896680d24bb216 > > Author: Saul Wold <sgw@linux.intel.com> > Date: Tue Jan 31 10:27:53 2012 -0800 > > opkg-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 <sgw@linux.intel.com> > > --- > > .../{opkg-utils_svn.bb => opkg-utils_git.bb} | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > similarity index 82% > rename from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb > rename to meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > index 9702131..d2dfda6 100644 > --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb > +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > @@ -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, > +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 > Openembedded-commits@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org 2012-02-01 15:37 ` [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org Martin Jansa @ 2012-02-09 22:07 ` Saul Wold 2012-02-09 22:30 ` Martin Jansa 0 siblings, 1 reply; 6+ messages in thread From: Saul Wold @ 2012-02-09 22:07 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa On 02/01/2012 07:37 AM, Martin Jansa wrote: > On Wed, Feb 01, 2012 at 03:15:31PM +0000, git@git.openembedded.org wrote: >> Module: openembedded-core.git >> Branch: master >> Commit: b44717c29c4f50917570039adf896680d24bb216 >> URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b44717c29c4f50917570039adf896680d24bb216 >> >> Author: Saul Wold<sgw@linux.intel.com> >> Date: Tue Jan 31 10:27:53 2012 -0800 >> >> opkg-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<sgw@linux.intel.com> >> >> --- >> >> .../{opkg-utils_svn.bb => opkg-utils_git.bb} | 10 +++++----- >> 1 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb >> similarity index 82% >> rename from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb >> rename to meta/recipes-devtools/opkg-utils/opkg-utils_git.bb >> index 9702131..d2dfda6 100644 >> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb >> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb >> @@ -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? > 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! > 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, > >> +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 >> Openembedded-commits@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org 2012-02-09 22:07 ` Saul Wold @ 2012-02-09 22:30 ` Martin Jansa 2012-02-09 22:59 ` Khem Raj ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Martin Jansa @ 2012-02-09 22:30 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 4965 bytes --] On Thu, Feb 09, 2012 at 02:07:05PM -0800, Saul Wold wrote: > On 02/01/2012 07:37 AM, Martin Jansa wrote: > > On Wed, Feb 01, 2012 at 03:15:31PM +0000, git@git.openembedded.org wrote: > >> Module: openembedded-core.git > >> Branch: master > >> Commit: b44717c29c4f50917570039adf896680d24bb216 > >> URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b44717c29c4f50917570039adf896680d24bb216 > >> > >> Author: Saul Wold<sgw@linux.intel.com> > >> Date: Tue Jan 31 10:27:53 2012 -0800 > >> > >> opkg-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<sgw@linux.intel.com> > >> > >> --- > >> > >> .../{opkg-utils_svn.bb => opkg-utils_git.bb} | 10 +++++----- > >> 1 files changed, 5 insertions(+), 5 deletions(-) > >> > >> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > >> similarity index 82% > >> rename from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb > >> rename to meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > >> index 9702131..d2dfda6 100644 > >> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb > >> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > >> @@ -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? > > > 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, > I would suggest the same for meta-oe and as we migrate other recipes > from OE-classic and update PV they get converted. > > Sau! > > > 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, > > > >> +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 > >> Openembedded-commits@lists.openembedded.org > >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits > > > > > > > > _______________________________________________ > > 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 [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org 2012-02-09 22:30 ` Martin Jansa @ 2012-02-09 22:59 ` Khem Raj 2012-02-09 23:14 ` Richard Purdie 2012-02-09 23:35 ` Phil Blundell 2 siblings, 0 replies; 6+ messages in thread From: Khem Raj @ 2012-02-09 22:59 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, Feb 9, 2012 at 2:30 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > Why +git when we have +svnr not +svn? and both systems call it revision? yes +${SCM}r seems more prevalent ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org 2012-02-09 22:30 ` Martin Jansa 2012-02-09 22:59 ` Khem Raj @ 2012-02-09 23:14 ` Richard Purdie 2012-02-09 23:35 ` Phil Blundell 2 siblings, 0 replies; 6+ messages in thread From: Richard Purdie @ 2012-02-09 23:14 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2012-02-09 at 23:30 +0100, Martin Jansa wrote: > On Thu, Feb 09, 2012 at 02:07:05PM -0800, Saul Wold wrote: > > On 02/01/2012 07:37 AM, Martin Jansa wrote: > > > On Wed, Feb 01, 2012 at 03:15:31PM +0000, git@git.openembedded.org wrote: > > >> Module: openembedded-core.git > > >> Branch: master > > >> Commit: b44717c29c4f50917570039adf896680d24bb216 > > >> URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b44717c29c4f50917570039adf896680d24bb216 > > >> > > >> Author: Saul Wold<sgw@linux.intel.com> > > >> Date: Tue Jan 31 10:27:53 2012 -0800 > > >> > > >> opkg-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<sgw@linux.intel.com> > > >> > > >> --- > > >> > > >> .../{opkg-utils_svn.bb => opkg-utils_git.bb} | 10 +++++----- > > >> 1 files changed, 5 insertions(+), 5 deletions(-) > > >> > > >> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > > >> similarity index 82% > > >> rename from meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb > > >> rename to meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > > >> index 9702131..d2dfda6 100644 > > >> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb > > >> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb > > >> @@ -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? > > > > > 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. > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org 2012-02-09 22:30 ` Martin Jansa 2012-02-09 22:59 ` Khem Raj 2012-02-09 23:14 ` Richard Purdie @ 2012-02-09 23:35 ` Phil Blundell 2 siblings, 0 replies; 6+ messages in thread From: Phil Blundell @ 2012-02-09 23:35 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2012-02-09 at 23:30 +0100, Martin Jansa wrote: > 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. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-09 23:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20120201151531.BE60410330@opal>
2012-02-01 15:37 ` [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org Martin Jansa
2012-02-09 22:07 ` Saul Wold
2012-02-09 22:30 ` Martin Jansa
2012-02-09 22:59 ` Khem Raj
2012-02-09 23:14 ` Richard Purdie
2012-02-09 23:35 ` Phil Blundell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox