board/alaska/flash.c: Fix GCC 4.6 build warnings

[u-boot] / tools / setlocalversion

diff --git a/tools/setlocalversion b/tools/setlocalversion
index bbb2ab2f71f562f212e2befcc6d8f69efb4f3124..e11f54f55ab0e5db943c2b6e879962aaf848ae97 100755 (executable)
--- a/tools/setlocalversion
+++ b/tools/setlocalversion
@@ -13,7 +13,8 @@ if head=`git rev-parse --verify 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
-               git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+               (git describe || git describe --tags || git describe --all --long) \
+                               2>/dev/null | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
        fi
 
        # Are there uncommitted changes?
@@ -25,7 +26,7 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 
        # Is this git on svn?
        if git config --get svn-remote.svn.url >/dev/null; then
-               printf -- '-svn%s' "`git-svn find-rev $head`"
+               printf -- '-svn%s' "`git svn find-rev $head`"
        fi
 fi