From patchwork Tue Mar  8 10:05:57 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: More flexibility for coreboot version string
Date: Tue, 08 Mar 2011 10:05:57 -0000
From: Patrick Georgi <Patrick.Georgi@secunet.com>
X-Patchwork-Id: 2754
Message-Id: <1299578757.2459.18.camel@linux-0a8x.site>
To: <coreboot@coreboot.org>

Hi,

attached patch improves flexibility on coreboot version strings in the
final binary. See attachment for details.
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>


commit 5d8fbe10ad1fb834874148a3e6adb01515362e35
Author: Patrick Georgi <Patrick.Georgi@secunet.com>
Date:   Tue Mar 8 10:56:34 2011 +0100

    More complete control over KERNELVERSION variable
    
    Allow using revision information (from svn or git) even if the version
    number is changed on the command line
    (eg. make KERNELVERSION='11.03$(REV)') or dropping it entirely if having
    that information in the coreboot binary is not desired.
    
    Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>

diff --git a/Makefile.inc b/Makefile.inc
index 1d2d0dc..ed58c94 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -19,7 +19,8 @@
 
 #######################################################################
 # misleadingly named, this is the coreboot version
-export KERNELVERSION      := 4.0
+REV=-r$(shell if [ -d $(top)/.svn -a -f "`which svnversion`" ]; then svnversion $(top); else if [ -d $(top)/.git -a -f "`which git`" ]; then git --git-dir=/$(top)/.git log|grep git-svn-id|cut -f 2 -d@|cut -f 1 -d' '|sort -g|tail -1; fi; fi)
+export KERNELVERSION      := 4.0$(REV)
 
 #######################################################################
 # Basic component discovery
@@ -120,7 +121,7 @@ $(obj)/build.h: .xcompile
 	printf "/* build system definitions (autogenerated) */\n" > $(obj)/build.ht
 	printf "#ifndef __BUILD_H\n" >> $(obj)/build.ht
 	printf "#define __BUILD_H\n\n" >> $(obj)/build.ht
-	printf "#define COREBOOT_VERSION \"$(KERNELVERSION)-r$(shell if [ -d $(top)/.svn -a -f "`which svnversion`" ]; then svnversion $(top); else if [ -d $(top)/.git -a -f "`which git`" ]; then git --git-dir=/$(top)/.git log|grep git-svn-id|cut -f 2 -d@|cut -f 1 -d' '|sort -g|tail -1; fi; fi)\"\n" >> $(obj)/build.ht
+	printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\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
 	printf "\n" >> $(obj)/build.ht