imported Ka-Ro specific additions to U-Boot 2009.08 for TX28

[karo-tx-uboot.git] / tools / setlocalversion

diff --git a/tools/setlocalversion b/tools/setlocalversion
index 9a23825218f20135eadd4b348e45de2b21a3d421..b3f5f2824b1056352a1e229951e739a269837b35 100755 (executable)
--- a/tools/setlocalversion
+++ b/tools/setlocalversion
@@ -11,12 +11,29 @@ cd "${1:-.}" || usage
 # Check for git and a git repo.
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
        # Do we have an untagged version?
-       if  [ "`git name-rev --tags HEAD`" = "HEAD undefined" ]; then
-               printf '%s%s' -g `echo "$head" | cut -c1-8`
+       if git name-rev --tags HEAD | \
+          grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
+               git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
        fi
 
        # Are there uncommitted changes?
-       if git diff-files | read dummy; then
+       git update-index --refresh --unmerged > /dev/null
+       if git diff-index --name-only HEAD | grep -v "^scripts/package" \
+           | 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`"