[patch] 0001-Only-set-GITVERSION-if-there-is-a-git-repository.patch

0001-Only-set-GITVERSION-if-there-is-a-git-repository.patch (text/plain), 1.26 KB, created by Florian Schmaus on 2014-07-28 14:29:54 UTC

From 2422abe61fdd9b625465cb780bf7a5f5b6a005d0 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <[e-mail]>
Date: Mon, 28 Jul 2014 16:20:18 +0200
Subject: [PATCH] Only set GITVERSION if there is a git repository

The bin/version.o target will fail if ipxe is build 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 typical manifests on source based distributions, see for
example https://bugs.gentoo.org/show_bug.cgi?id=482804
---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 22a7335..e8bf2e7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -190,7 +190,7 @@ 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)
+GITVERSION := $(shell [ -d ../.git ] && git describe --always --abbrev=1 --match "" 2>/dev/null)
 ifneq ($(GITVERSION),)
 VERSION		+= ($(GITVERSION))
 endif
-- 
1.9.2