[Patch v2] scmversion: 'Improve' svn interaction.

[Patch v2] scmversion: 'Improve' svn interaction.

[Andrew Cooper]

Xen has never been in an svn tree, and the current code will unconditionally
create a .svn directory when run from a tarball.

Therefore, simply discard the svn support.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Marek Marczykowski <marmarek@invisiblethingslab.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <jbeulich@suse.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>

---
Changes since v1:
 * Completely discard svn support rather than fixing it, as suggested by IanC
---
 xen/tools/scmversion |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/xen/tools/scmversion b/xen/tools/scmversion
index b0c3b95..b6ce049 100755
--- a/xen/tools/scmversion
+++ b/xen/tools/scmversion
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # This scripts adds local version information from the version
-# control systems git, mercurial (hg) and subversion (svn).
+# control systems git and mercurial (hg).
 #
 # If something goes wrong, send a mail the kernel build mailinglist
 # (see MAINTAINERS) and CC Nico Schottelius
@@ -75,15 +75,6 @@ scm_version()
 		# All done with mercurial
 		return
 	fi
-
-	# Check for svn and a svn repo.
-	if rev=`LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
-		rev=`echo $rev | awk '{print $NF}'`
-		printf -- 'svn:%s' "$rev"
-
-		# All done with svn
-		return
-	fi
 }
 
 cd $srctree
-- 
1.7.10.4

Re: [Patch v2] scmversion: 'Improve' svn interaction.

[Ian Campbell]

On Fri, 2013-08-02 at 16:52 +0100, Andrew Cooper wrote:
> Xen has never been in an svn tree, and the current code will unconditionally
> create a .svn directory when run from a tarball.
> 
> Therefore, simply discard the svn support.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Marek Marczykowski <marmarek@invisiblethingslab.com>
> CC: Keir Fraser <keir@xen.org>
> CC: Jan Beulich <jbeulich@suse.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> 
> ---
> Changes since v1:
>  * Completely discard svn support rather than fixing it, as suggested by IanC
> ---
>  xen/tools/scmversion |   11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/xen/tools/scmversion b/xen/tools/scmversion
> index b0c3b95..b6ce049 100755
> --- a/xen/tools/scmversion
> +++ b/xen/tools/scmversion
> @@ -1,7 +1,7 @@
>  #!/bin/sh
>  #
>  # This scripts adds local version information from the version
> -# control systems git, mercurial (hg) and subversion (svn).
> +# control systems git and mercurial (hg).
>  #
>  # If something goes wrong, send a mail the kernel build mailinglist
>  # (see MAINTAINERS) and CC Nico Schottelius
> @@ -75,15 +75,6 @@ scm_version()
>  		# All done with mercurial
>  		return
>  	fi
> -
> -	# Check for svn and a svn repo.
> -	if rev=`LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
> -		rev=`echo $rev | awk '{print $NF}'`
> -		printf -- 'svn:%s' "$rev"
> -
> -		# All done with svn
> -		return
> -	fi
>  }
>  
>  cd $srctree

Re: [Patch v2] scmversion: 'Improve' svn interaction.

[Keir Fraser]

On 02/08/2013 16:52, "Andrew Cooper" <andrew.cooper3@citrix.com> wrote:

> Xen has never been in an svn tree, and the current code will unconditionally
> create a .svn directory when run from a tarball.
> 
> Therefore, simply discard the svn support.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Marek Marczykowski <marmarek@invisiblethingslab.com>
> CC: Keir Fraser <keir@xen.org>
> CC: Jan Beulich <jbeulich@suse.com>
> CC: Ian Campbell <ian.campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>

Acked-by: Keir Fraser <keir@xen.org>

> ---
> Changes since v1:
>  * Completely discard svn support rather than fixing it, as suggested by IanC
> ---
>  xen/tools/scmversion |   11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/xen/tools/scmversion b/xen/tools/scmversion
> index b0c3b95..b6ce049 100755
> --- a/xen/tools/scmversion
> +++ b/xen/tools/scmversion
> @@ -1,7 +1,7 @@
>  #!/bin/sh
>  #
>  # This scripts adds local version information from the version
> -# control systems git, mercurial (hg) and subversion (svn).
> +# control systems git and mercurial (hg).
>  #
>  # If something goes wrong, send a mail the kernel build mailinglist
>  # (see MAINTAINERS) and CC Nico Schottelius
> @@ -75,15 +75,6 @@ scm_version()
> # All done with mercurial
> return
> fi
> -
> - # Check for svn and a svn repo.
> - if rev=`LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last
> Changed Rev'`; then
> -  rev=`echo $rev | awk '{print $NF}'`
> -  printf -- 'svn:%s' "$rev"
> -
> -  # All done with svn
> -  return
> - fi
>  }
>  
>  cd $srctree

Re: [Patch v2] scmversion: 'Improve' svn interaction.

[Ian Campbell]

On Fri, 2013-08-02 at 17:02 +0100, Keir Fraser wrote:
> On 02/08/2013 16:52, "Andrew Cooper" <andrew.cooper3@citrix.com> wrote:
> 
> > Xen has never been in an svn tree, and the current code will unconditionally
> > create a .svn directory when run from a tarball.
> > 
> > Therefore, simply discard the svn support.
> > 
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > CC: Marek Marczykowski <marmarek@invisiblethingslab.com>
> > CC: Keir Fraser <keir@xen.org>
> > CC: Jan Beulich <jbeulich@suse.com>
> > CC: Ian Campbell <ian.campbell@citrix.com>
> > CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> 
> Acked-by: Keir Fraser <keir@xen.org>

Applied.