From: Florian Schmaus Date: Mon, 28 Jul 2014 15:47:48 +0000 (+0100) Subject: [build] Set GITVERSION only if there is a git repository X-Git-Tag: v1.20.1~1120 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6153c09c41034250408f3596555fcaae715da46c;p=thirdparty%2Fipxe.git [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 Signed-off-by: Michael Brown --- diff --git a/src/Makefile b/src/Makefile index 22a733524..c6760ee95 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 :