This patch hooks up git mirrored svn revisions and adds some

error checking to the svnrevision call.

If a .svn directory exists in the top level directory and the svnversion
utility is available, we use svnversion.
Otherwise, if a .git directory exists in the top level directory and the
git utility is available, we use git log.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4194 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Carl-Daniel Hailfinger 2009-04-23 13:05:45 +00:00
parent 2c245ff70e
commit 4940ab7a21
1 changed files with 4 additions and 1 deletions

View File

@ -96,8 +96,11 @@ define OBJCOPY
export always export always
comment "Objcopy command" comment "Objcopy command"
end end
# Try to determine svn revision first.
# If that fails, try last svn revision in git log.
define COREBOOT_VERSION define COREBOOT_VERSION
default "2.0.0-r$(shell if [ -f `which svnversion` ]; then svnversion $(TOP); fi)" default "2.0.0-r$(shell if [ -d $(TOP)/.svn -a -f `which svnversion` ]; then svnversion $(TOP); else if [ -d $(TOP)/.git -a -f `which git` ]; then git --git-dir=/$(TOP)/.git log|grep git-svn-id|cut -f 2 -d@|cut -f 1 -d' '|sort -g|tail -1; fi; fi)"
export always export always
format "\"%s\"" format "\"%s\""
comment "coreboot version" comment "coreboot version"