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

[Martin Jansa <martin.jansa@gmail.com>]

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