[OE-core] [oe-commits] Saul Wold : opkg-utils: convert to git repo at git.yoctoproject.org

[Richard Purdie]

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 at 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 at 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 at 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