[coreboot-gerrit] Patch set updated for coreboot: 492b2a2 Makefile.inc: don't use git for version timestamp

Francis Rowe (info@gluglug.org.uk) gerrit at coreboot.org
Thu Feb 12 05:45:03 CET 2015


Francis Rowe (info at gluglug.org.uk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8423

-gerrit

commit 492b2a26ea838852174f3170a594147cfbedf4df
Author: Francis Rowe <info at gluglug.org.uk>
Date:   Wed Feb 11 18:24:43 2015 +0000

    Makefile.inc: don't use git for version timestamp
    
    If coreboot is built without the .git* files, there is this error:
    src/lib/version.c:38:75: error: expected expression before ';'
    
    This is because the COREBOOT_VERSION_TIMESTAMP define in
    build/build.h, as generated by Makefile.inc, relies on git.
    
    Change-Id: Ic6b857731f8cb212e30c627037577d837ac783b1
    Signed-off-by: Francis Rowe <info at gluglug.org.uk>
---
 Makefile.inc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 0c6aafa..a900b97 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -276,13 +276,8 @@ $(obj)/build.h: .xcompile
 	printf "#ifndef __BUILD_H\n" >> $(obj)/build.ht
 	printf "#define __BUILD_H\n\n" >> $(obj)/build.ht
 	printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" >> $(obj)/build.ht
-	if git update-index -q --refresh >/dev/null; ! git diff-index --quiet HEAD; then \
-	   printf "/* `LANG= TZ=UTC git log --date=local --pretty=format:%cd -1` UTC */\n" >> $(obj)/build.ht; \
-	   printf "#define COREBOOT_VERSION_TIMESTAMP `LANG= git log --pretty=format:%ct -1`\n" >> $(obj)/build.ht; \
-	else \
-	   printf "/* `LANG= TZ=UTC date` */\n" >> $(obj)/build.ht; \
-	   printf "#define COREBOOT_VERSION_TIMESTAMP `LANG= date +%s`\n" >> $(obj)/build.ht; \
-        fi
+	printf "/* `LANG= TZ=UTC date` */\n" >> $(obj)/build.ht; \
+	printf "#define COREBOOT_VERSION_TIMESTAMP `LANG= date +%s`\n" >> $(obj)/build.ht; \
 	printf "#define COREBOOT_ORIGIN_GIT_REVISION \"`LANG= git log remotes/origin/master -1 --format=format:%h`\"\n" >> $(obj)/build.ht
 	printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.ht
 	printf "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.ht



More information about the coreboot-gerrit mailing list