mirror of https://github.com/ipxe/ipxe.git
[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>pull/598/head
parent
b3b939c6ff
commit
348ec33aee
|
@ -165,13 +165,17 @@ VERSION_PATCH = 0
|
||||||
EXTRAVERSION = +
|
EXTRAVERSION = +
|
||||||
MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
|
MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
|
||||||
VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
|
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) \
|
CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) \
|
||||||
-DVERSION_MINOR=$(VERSION_MINOR) \
|
-DVERSION_MINOR=$(VERSION_MINOR) \
|
||||||
-DVERSION_PATCH=$(VERSION_PATCH) \
|
-DVERSION_PATCH=$(VERSION_PATCH) \
|
||||||
-DVERSION=\"$(VERSION)\"
|
-DVERSION="\"$(VERSION)\""
|
||||||
IDENT = '$(@F) $(VERSION) (GPL) ipxe.org'
|
IDENT = '$(@F) $(VERSION) (GPL) ipxe.org'
|
||||||
version :
|
version :
|
||||||
@$(ECHO) $(VERSION)
|
@$(ECHO) "$(VERSION)"
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue