[ARM] Update mach-types

[linux-2.6] / scripts / setlocalversion

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 83b7512..72d2335 100755 (executable)
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -9,11 +9,13 @@ usage() {
 cd "${1:-.}" || usage
 
 # Check for git and a git repo.
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
        # Do we have an untagged version?
        if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
                if tag=`git describe 2>/dev/null`; then
                        echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+               else
+                       printf '%s%s' -g $head
                fi
        fi
 
@@ -55,7 +57,7 @@ if rev=`svn info 2>/dev/null | grep '^Revision'`; then
 
        # Are there uncommitted changes?
        if [ $changes != 0 ]; then
-               printf -- '-svn%s%s%s' "$rev" -dirty "$changes"
+               printf -- '-svn%s%s' "$rev" -dirty
        else
                printf -- '-svn%s' "$rev"
        fi