summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzbao <fishbaozi@gmail.com>2012-07-23 12:11:59 +0800
committerPatrick Georgi <patrick@georgi-clan.de>2012-07-27 07:58:37 +0200
commitd51f974e7bf9da57953b234e8600520c57c629ed (patch)
tree92da8bfc6c90837690798a1a7c12bf53561d72d7
parent188e3c2ff06a82f61d7d71e610b32b1a250c0a45 (diff)
downloadcoreboot-d51f974e7bf9da57953b234e8600520c57c629ed.tar.xz
Re-run the git-describe if it fails at first try.
Old rev (1.6.6, in my case) git-describe doesn't take the --dirty and says error. Remove the --dirty at second try. Change-Id: Id6c6f9889ab20fb7c2b238f8c0bbe20134757369 Signed-off-by: Zheng Bao <zheng.bao@amd.com> Signed-off-by: zbao <fishbaozi@gmail.com> Reviewed-on: http://review.coreboot.org/1261 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--Makefile.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 176ff6750e..ca1e066872 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -19,7 +19,7 @@
#######################################################################
# misleadingly named, this is the coreboot version
-export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "`which git`" ]; then git describe --dirty; else echo unknown; fi)
+export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "`which git`" ]; then git describe --dirty 2>/dev/null || git describe; else echo unknown; fi)
#######################################################################
# Basic component discovery