From 40032e1b0b9a92169a1fb2d683741c5a84a3448c Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sun, 19 Jul 2015 21:45:17 +0200 Subject: [PATCH] replace old u-boot setlocalversion script with our git describe version now includes our tag as well. --- u-boot/tools/setlocalversion | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/u-boot/tools/setlocalversion b/u-boot/tools/setlocalversion index 9a23825218..45f54b03c7 100755 --- a/u-boot/tools/setlocalversion +++ b/u-boot/tools/setlocalversion @@ -8,15 +8,6 @@ usage() { 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` - fi - - # Are there uncommitted changes? - if git diff-files | read dummy; then - printf '%s' -dirty - fi +if version=$(git describe --dirty --always --match="ar9331-v*" 2>/dev/null) ; then + echo "-$version" fi