Build failed in Jenkins: cgit - upstream - get-git - master #190 - remotes/origin/master - a360666

[John Keeping]

On Thu, Aug 13, 2015 at 04:35:51PM +0200, Ferry Huberts wrote:
> 
> 
> On 13/08/15 16:32, Jason A. Donenfeld wrote:
> > John -- why are their circumstances in which your config.mak.uname isn't
> > created?
> 
> It's in the 'get-git' build.
> So that is the build in which git is built from a 'release' tar instead 
> of from its repo

And the problem is in the "get-git" stage, at which point the "git"
directory doesn't exist.

This fixes it:

-- >8 --
Subject: [PATCH] Makefile: make "git/config.mak.uname" inclusion optional

If we haven't got a "git" directory, it should still be possible to run
"make get-git", so we cannot include this file unconditionally.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 74061a3..a0a6615 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
 
 #-include config.mak
 
-include git/config.mak.uname
+-include git/config.mak.uname
 #
 # Let the user override the above settings.
 #
-- 
2.5.0.466.g9af26fa