Update version string and fix some internal variables in Makefile
Moving from Subversion to Git necessitated re-formatting the version
string. In this case, we're making it look more like the Chromium OS
branch of Flashrom, which uses colons in between fields.
However, some of the internal variables that get passed into
other kconfig scripts don't handle the new formatting well. In those
cases, we'll use the x.y.z format without the SCM-generated info.
Note: The git info will only appear for versions which ahve been
checked-in.
BUG=none
TEST=built and run on stumpy
Change-Id: Ie2f88225bcb2c1b8409bf6755b270f44142e251f
diff --git a/Makefile b/Makefile
index e3efba5..e559c31 100644
--- a/Makefile
+++ b/Makefile
@@ -25,13 +25,13 @@
# major: Major release number; incremented at major milestones
# minor: Minor release number; incremented for important changes
# revision: Patch number from version control system
-CORE = 1
-MAJOR = 2
-MINOR = 03
-SVNVERSION := $(shell ./scripts/getversion.sh -r)
-REVISION=$(SVNVERSION)
+CORE = 1
+MAJOR = 2
+MINOR = 03
+GITVERSION := $(shell ./scripts/getversion.sh -r)
+TIMESTAMP := $(shell ./scripts/getversion.sh -t)
-RELEASENAME=$(CORE).$(MAJOR).$(MINOR).$(REVISION)
+RELEASENAME := "$(CORE).$(MAJOR).$(MINOR) : $(GITVERSION) : $(TIMESTAMP)"
# location to use when releasing new packages
export EXPORTDIR ?= .
@@ -289,7 +289,7 @@
-include include/generated/autoconf.h \
-Itools/vpd_encode
-KERNELVERSION = $(RELEASENAME)
+KERNELVERSION = $(CORE).$(MAJOR).$(MINOR)
FMAP_LINKOPT ?= -lfmap-0.3
LDLIBS := -luuid $(FMAP_LINKOPT)
@@ -297,7 +297,7 @@
#EXTRA_CFLAGS := $(patsubst %,-l%, $(LIBRARIES))
MOSYS_MACROS := -DPROGRAM=\"$(PROGRAM)\" \
- -DVERSION=\"$(KERNELVERSION)\"
+ -DVERSION=\"$(RELEASENAME)\"
KBUILD_CPPFLAGS :=
@@ -634,7 +634,7 @@
VPD_ENCODE_DEFCONFIG := "vpd_encode.config"
VPD_ENCODE_MACROS := -DPROGRAM=\"vpd_encode\" \
- -DVERSION=\"$(KERNELVERSION)\" \
+ -DVERSION=\"$(RELEASENAME)\" \
-DVPD_ENCODE_CONFIG=\"$(VPD_ENCODE_DEFCONFIG)\"
# FIXME: should only depend on libs/ being a prerequisite
