Skip to contentSkip to conversation

Add support for u-boot in svn and localversion-* files

PATCH New Mike Frysinger 5 participants 10 messages Jan 26, 2008 – Apr 20, 2008

lore
Share & tools
lore

Mike Frysinger

author
#0 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

Signed-off-by Mike Frysinger <[email protected]>
---
 tools/setlocalversion |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
tools/setlocalversion +14 -0
index 9a23825..5ff7f2e 100755
@@ -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`"
Signature · 1 line
1.5.3.8
author
#1 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

Signed-off-by Mike Frysinger <[email protected]>
---
 tools/setlocalversion |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
tools/setlocalversion +14 -0
index 9bbdafd..bbb2ab2 100755
@@ -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`"
Signature · 1 line
1.5.4.4
#2 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

Quoted 1 line · In message <[email protected]> you wrote:
Signed-off-by Mike Frysinger <[email protected]>

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

Best regards,

Wolfgang Denk

Signature · 5 lines
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.
#3 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

Quoted 12 lines · Wolfgang Denk
Quoted 2 lines · In message <[email protected]> you wrote:
Signed-off-by Mike Frysinger <[email protected]>

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

#4 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

Quoted 9 lines · Ben Warren
Quoted 8 lines · Wolfgang Denk

In message <[email protected]>

Quoted 2 lines · you
Signed-off-by Mike Frysinger <[email protected]>

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

Quoted 8 lines
Quoted 5 lines

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

#5 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

Quoted 13 lines · Kumar Gala
Quoted 11 lines · Ben Warren
Quoted 10 lines · Wolfgang Denk

In message <[email protected]>

Quoted 2 lines · you
Signed-off-by Mike Frysinger <[email protected]>

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

Best regards,

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

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.

#6 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

Quoted 25 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 23 lines · Kumar Gala
Quoted 21 lines · Ben Warren
Quoted 4 lines · Wolfgang Denk

In message <[email protected]> you wrote:

Quoted 11 lines
Quoted 3 lines
Signed-off-by Mike Frysinger <[email protected]>

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.

Quoted 9 lines
Quoted 2 lines

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

author
#7 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

Quoted 19 lines · Ben Warren
Quoted 18 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 17 lines · Kumar Gala
Quoted 15 lines · Ben Warren
Quoted 10 lines · Wolfgang Denk

In message <[email protected]>

Quoted 1 line · you
Signed-off-by Mike Frysinger <[email protected]>

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.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

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

author
#8 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

In reply to Wolfgang Denk
Quoted 4 lines · Wolfgang Denk
Quoted 1 line · In message <[email protected]> you wrote:
Signed-off-by Mike Frysinger <[email protected]>

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

Applied
#9 lore raw

PATCH 1/1 Add support for u-boot in svn and localversion-* files

In reply to Mike Frysinger
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Mike Frysinger <[email protected]>
---
 tools/setlocalversion |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 7 lines
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_