From f60088960b34c876723693921e95ff42b613a9df Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 2 Feb 2013 01:26:07 +0100 Subject: [PATCH] Use 'git describe' to get firmware version Signed-off-by: Tim Niemeyer --- buildscript | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/buildscript b/buildscript index 0019436..40ab9d7 100755 --- a/buildscript +++ b/buildscript @@ -32,13 +32,7 @@ prebuild() { board_prebuild #insert actual firware version informations into release file - dirty=$(test "$(git status --porcelain -uno)" = "" || echo "-dirty") - commit=$(git log -n1 | grep commit | awk '{ print $2 }') - version=$(git tag --contains $commit~~ | tail -n1) - if [ "$version" = "" ] - then - version=$commit$dirty - fi + version=$(git describe --tags --dirty) echo "FIRMWARE_VERSION=\"$version\"" > $target/files/etc/firmware_release echo "RELEASE_DATE=\"build date: "`date`"\"" >> $target/files/etc/firmware_release