[coreboot] New patch to review for coreboot: 2078889 Fix 'git describe' invocation

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2637

-gerrit

commit 2078889dd8dce7342be6b85c9b222533b769f804
Author: Vadim Bendebury <vbendeb at chromium.org>
Date:   Mon Dec 10 15:47:23 2012 -0800

    Fix 'git describe' invocation
    
    The 'git describe' command is used to obtain the source tree status
    information when building coreboot. As used this command expects git
    tags to be defined, so it can report the discrepancy between the
    current state of the tree and the latest tag.
    
    The problem is that the coreboot source tree does not have any git
    tags defined, so when 'git describe' is invoked, it reports "fatal: No
    names found, cannot describe anything.". This scary message can be
    seen on the console during coreboot builds.
    
    The solution is to add --always to the `git describe' invocation,
    which causes it to report the discrepancy with the latest sha1, if
    any, which is better than nothing.
    
      $ rm -rf /tmp/li && mkdir /tmp/li
      $ cp configs/config.link .config
      $ make obj=/tmp/li oldconfig
      $ make obj=/tmp/li
      $ grep COREBOOT_VERSION /tmp/li/build.h
      #define COREBOOT_VERSION "1623c06"
      $ echo '#' >> Makefile.inc
      $ grep COREBOOT_VERSION /tmp/li/build.h
      $ make obj=/tmp/li
      #define COREBOOT_VERSION "1623c06-dirty"
      $ git checkout Makefile.inc
    
    Change-Id: Ia77428b7cd765cbbd59bdbf8251b7bef489d47a5
    Signed-off-by: Vadim Bendebury <vbendeb at chromium.org>
---
 Makefile.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc b/Makefile.inc
index ad97363..158ac44 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -19,7 +19,9 @@
 
 #######################################################################
 # misleadingly named, this is the coreboot version
-export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "`which git`" ]; then git describe --dirty 2>/dev/null || git describe; else echo unknown; fi)
+export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "`which git`" ]; \
+       then git describe --dirty --always || git describe; \
+       else echo 4.0$(KERNELREVISION); fi)
 
 #######################################################################
 # Basic component discovery