aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2012-07-20 18:06:15 +0100
committerMichael Brown <mcb30@ipxe.org>2012-07-20 18:08:52 +0100
commit348ec33aee6b34edcec8e7273cf2435b4e8910b8 (patch)
tree8fdfc6495ff500e30ad47f45e12616578e57beab
parentb3b939c6ff67eb108a331d48320ea1720a291937 (diff)
downloadipxe-348ec33aee6b34edcec8e7273cf2435b4e8910b8.zip
ipxe-348ec33aee6b34edcec8e7273cf2435b4e8910b8.tar.gz
ipxe-348ec33aee6b34edcec8e7273cf2435b4e8910b8.tar.bz2
[build] Include git commit within version string when available
Originally-implemented-by: Christian Hesse <list@eworm.de> Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 6537ecb..a061f83 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -165,13 +165,17 @@ VERSION_PATCH = 0
EXTRAVERSION = +
MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
+GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null)
+ifneq ($(GITVERSION),)
+VERSION += ($(GITVERSION))
+endif
CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) \
-DVERSION_MINOR=$(VERSION_MINOR) \
-DVERSION_PATCH=$(VERSION_PATCH) \
- -DVERSION=\"$(VERSION)\"
+ -DVERSION="\"$(VERSION)\""
IDENT = '$(@F) $(VERSION) (GPL) ipxe.org'
version :
- @$(ECHO) $(VERSION)
+ @$(ECHO) "$(VERSION)"
###############################################################################
#