[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Mike Frysinger]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 tools/setlocalversion |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/tools/setlocalversion b/tools/setlocalversion
index 9a23825..5ff7f2e 100755
--- a/tools/setlocalversion
+++ b/tools/setlocalversion
@@ -19,4 +19,18 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	if git diff-files | read dummy; then
 		printf '%s' -dirty
 	fi
+
+	# Is this git on svn?
+	if git config --get svn-remote.svn.url >/dev/null; then
+		printf -- '-svn%s' "`git-svn find-rev $head`"
+	fi
 fi
+
+# Check for svn and a svn repo.
+if rev=`svn info 2>/dev/null` ; then
+	rev=`echo "${rev}" | grep '^Revision' | awk '{print $NF}'`
+	printf -- '-svn%s' $rev
+fi
+
+# Check for any localversion-* files
+printf '%s' "`cat localversion-* 2>/dev/null`"
-- 
1.5.3.8

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Mike Frysinger]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 tools/setlocalversion |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/tools/setlocalversion b/tools/setlocalversion
index 9bbdafd..bbb2ab2 100755
--- a/tools/setlocalversion
+++ b/tools/setlocalversion
@@ -22,4 +22,18 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	    | read dummy; then
 		printf '%s' -dirty
 	fi
+
+	# Is this git on svn?
+	if git config --get svn-remote.svn.url >/dev/null; then
+		printf -- '-svn%s' "`git-svn find-rev $head`"
+	fi
 fi
+
+# Check for svn and a svn repo.
+if rev=`svn info 2>/dev/null` ; then
+	rev=`echo "${rev}" | grep '^Revision' | awk '{print $NF}'`
+	printf -- '-svn%s' $rev
+fi
+
+# Check for any localversion-* files
+printf '%s' "`cat localversion-* 2>/dev/null`"
-- 
1.5.4.4

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Wolfgang Denk]

In message <1207677657-31722-1-git-send-email-vapier@gentoo.org> you wrote:
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Hm... is anybody using SVN for U-Boot?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Philosophy is a game with objectives and no rules.
Mathematics is a game with rules and no objectives.

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Ben Warren]

Wolfgang Denk wrote:
> In message <1207677657-31722-1-git-send-email-vapier@gentoo.org> you wrote:
>   
>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>>     
>
> Hm... is anybody using SVN for U-Boot?
>
> Best regards,
>
> Wolfgang Denk
>
>   
I used it at my last company and will most certainly use it again, and 
appreciate this patch.  I think it's very popular in companies that 
prefer free, more traditional revision control.

regards,
Ben

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Kumar Gala]

On Apr 8, 2008, at 4:19 PM, Ben Warren wrote:
> Wolfgang Denk wrote:
>> In message <1207677657-31722-1-git-send-email-vapier@gentoo.org>  
>> you wrote:
>>
>>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>>>
>>
>> Hm... is anybody using SVN for U-Boot?
>>
>> Best regards,
>>
>> Wolfgang Denk
>>
>>
> I used it at my last company and will most certainly use it again, and
> appreciate this patch.  I think it's very popular in companies that
> prefer free, more traditional revision control.

bah, use git :)

- k

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Jean-Christophe PLAGNIOL-VILLARD]

On 16:49 Tue 08 Apr     , Kumar Gala wrote:
> 
> On Apr 8, 2008, at 4:19 PM, Ben Warren wrote:
> > Wolfgang Denk wrote:
> >> In message <1207677657-31722-1-git-send-email-vapier@gentoo.org>  
> >> you wrote:
> >>
> >>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> >>>
> >>
> >> Hm... is anybody using SVN for U-Boot?
> >>
> >> Best regards,
> >>
> >> Wolfgang Denk
> >>
> >>
> > I used it at my last company and will most certainly use it again, and
> > appreciate this patch.  I think it's very popular in companies that
> > prefer free, more traditional revision control.
> 
> bah, use git :)

Yeah, use git or at least git-svn

Best Regards,
J.

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Ben Warren]

Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 16:49 Tue 08 Apr     , Kumar Gala wrote:
>   
>> On Apr 8, 2008, at 4:19 PM, Ben Warren wrote:
>>     
>>> Wolfgang Denk wrote:
>>>       
>>>> In message <1207677657-31722-1-git-send-email-vapier@gentoo.org>  
>>>> you wrote:
>>>>
>>>>         
>>>>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>>>>>
>>>>>           
>>>> Hm... is anybody using SVN for U-Boot?
>>>>
>>>> Best regards,
>>>>
>>>> Wolfgang Denk
>>>>
>>>>
>>>>         
>>> I used it at my last company and will most certainly use it again, and
>>> appreciate this patch.  I think it's very popular in companies that
>>> prefer free, more traditional revision control.
>>>       
>> bah, use git :)
>>     
>
> Yeah, use git or at least git-svn
>
> Best Regards,
> J.
>
>   
Easy to say, isn't it.  OTOH, this patch doesn't really add complexity, 
doesn't increase code size and nobody gets hurt.  Why not include it?

regards,
Ben

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Mike Frysinger]

On Wednesday 09 April 2008, Ben Warren wrote:
> Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 16:49 Tue 08 Apr     , Kumar Gala wrote:
> >> On Apr 8, 2008, at 4:19 PM, Ben Warren wrote:
> >>> Wolfgang Denk wrote:
> >>>> In message <1207677657-31722-1-git-send-email-vapier@gentoo.org>
> >>>>
> >>>> you wrote:
> >>>>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> >>>>
> >>>> Hm... is anybody using SVN for U-Boot?
> >>>>
> >>>> Best regards,
> >>>>
> >>>> Wolfgang Denk
> >>>
> >>> I used it at my last company and will most certainly use it again, and
> >>> appreciate this patch.  I think it's very popular in companies that
> >>> prefer free, more traditional revision control.
> >>
> >> bah, use git :)
> >
> > Yeah, use git or at least git-svn
>
> Easy to say, isn't it.  OTOH, this patch doesn't really add complexity,
> doesn't increase code size and nobody gets hurt.  Why not include it?

pretty much.  while i may be able to use git, not everyone is fluent in it, 
and forcing them to use git is simply a waste of time.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080409/cfcac316/attachment.pgp 

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Mike Frysinger]

On Tuesday 08 April 2008, Wolfgang Denk wrote:
> In message <1207677657-31722-1-git-send-email-vapier@gentoo.org> you wrote:
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>
> Hm... is anybody using SVN for U-Boot?

i am, otherwise i wouldnt care :)
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080408/bab61023/attachment.pgp 

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files

[Wolfgang Denk]

In message <1207677657-31722-1-git-send-email-vapier@gentoo.org> you wrote:
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  tools/setlocalversion |   14 ++++++++++++++
>  1 files changed, 14 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
They weren't that important. They were merely at the top. The  people
who  really  run organizations are usually found several levels down,
where it's still possible to get things done.
                                      - Terry Pratchett, _Small Gods_