[coreboot-gerrit] New patch to review for coreboot: genbuild_h: report the current git revision instead of origin/master.

[Denis Carikli (GNUtoo@no-log.org)]

Denis Carikli (GNUtoo at no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11873

-gerrit

commit f97746f6d2952fa40794a30bfa5f4e7611f8c071
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Sun Oct 11 12:35:51 2015 +0200

    genbuild_h: report the current git revision instead of origin/master.
    
    This fixes the following commit:
    "a74d569 genbuild_h.sh: use the last git commit as timesource if available"
    
    This issue also affected reproducible builds when origin/master was not the
    same between build setup: different git revision ended up in the "revision"
    component in coreboot.rom's cbfs.
    
    Change-Id: Id1ba8b1ee6d48eecd547df2b6302820719c578ac
    Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
---
 util/genbuild_h/genbuild_h.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh
index 2a009c1..4660773 100755
--- a/util/genbuild_h/genbuild_h.sh
+++ b/util/genbuild_h/genbuild_h.sh
@@ -29,7 +29,7 @@ export TZ=UTC
 top=`dirname $0`/../..
 
 if [ -d "${top}/.git" -a -x "$(command -v git)" ]; then
-	GITREV=$(LANG= git log remotes/origin/master -1 --format=format:%h)
+	GITREV=$(LANG= git log HEAD -1 --format=format:%h)
 	TIMESOURCE=git
 	DATE=$(git log --pretty=format:%ct -1)
 else
@@ -57,7 +57,7 @@ printf "#define COREBOOT_VERSION %s\n" "\"$KERNELVERSION\""
 #See if the build is running in a git repo and the git command is available
 printf "/* timesource: $TIMESOURCE */\n"
 printf "#define COREBOOT_VERSION_TIMESTAMP $DATE\n"
-printf "#define COREBOOT_ORIGIN_GIT_REVISION \"$GITREV\"\n"
+printf "#define COREBOOT_GIT_REVISION \"$GITREV\"\n"
 
 printf "#define COREBOOT_EXTRA_VERSION \"%s\"\n" "$COREBOOT_EXTRA_VERSION"
 printf "#define COREBOOT_BUILD \"$(our_date "$DATE")\"\n"