From 88e8197ed776f1a08ef28556583a95ff4a6bf679 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 20 Apr 2017 20:00:46 +0000 Subject: [PATCH] projects-dir.mk: Partly disable persistent SSH Don't use persistent SSH-connections any more for "pkg-" targets, because, sadly, this hangs after uploading a package. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 197dde0a..e91fc871 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -50,7 +50,9 @@ else endif export GIT_SSH := $(CVS_RSH) -export JW_BUILD_SSH_EXTRA_OPTS += -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%p -o ControlPersist=3m +ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) + export JW_BUILD_SSH_EXTRA_OPTS += -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%p -o ControlPersist=3m +endif ifneq ($(CLONE_FROM_USER),) export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)