summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Schmaus2014-07-28 17:47:48 +0200
committerMichael Brown2014-07-28 17:57:39 +0200
commit6153c09c41034250408f3596555fcaae715da46c (patch)
tree03a4f9ece170c58051cdb46c0ea060f5fb58be9b
parent[efi] Show more diagnostic information when building with DEBUG=efi_wrap (diff)
downloadipxe-6153c09c41034250408f3596555fcaae715da46c.tar.gz
ipxe-6153c09c41034250408f3596555fcaae715da46c.tar.xz
ipxe-6153c09c41034250408f3596555fcaae715da46c.zip
[build] Set GITVERSION only if there is a git repository
The $(BIN)/version.%.o target will fail if iPXE is built within a non-git repository, e.g. when the user downloaded and extracted an archive containing iPXE sources, *and* if any parent directory of the iPXE sources is a git repository (or even contains a directory named ".git"). This is because git will by default ascend the directory tree and look for ".git". The problem typically manifests on source based distributions, see for example https://bugs.gentoo.org/show_bug.cgi?id=482804 Modified-by: Michael Brown <mcb30@ipxe.org> Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 22a73352..c6760ee9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -190,8 +190,8 @@ VERSION_PATCH = 0
EXTRAVERSION = +
MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
+ifneq ($(wildcard ../.git),)
GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null)
-ifneq ($(GITVERSION),)
VERSION += ($(GITVERSION))
endif
version :