[coreboot] New patch to review for coreboot: caea002 Re-run the git-describe if it fails at first try.

Zheng Bao (zheng.bao@amd.com) gerrit at coreboot.org
Mon Jul 23 04:30:53 CEST 2012


Zheng Bao (zheng.bao at amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1261

-gerrit

commit caea00287693097c2b3724485892526357e64d13
Author: zbao <fishbaozi at gmail.com>
Date:   Mon Jul 23 12:11:59 2012 +0800

    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 at amd.com>
    Signed-off-by: zbao <fishbaozi at gmail.com>
---
 Makefile.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 176ff67..ca1e066 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




More information about the coreboot mailing list