janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

projects-dir.mk: Partly disable persistent SSH

Browse source 
Don't use persistent SSH-connections any more for "pkg-" targets,
because, sadly, this hangs after uploading a package.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-20 20:00:46 +00:00
commit 88e8197ed7
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/projects-dir.mk
View file

@ -50,7 +50,9 @@ else
endif endif
export GIT_SSH := $(CVS_RSH) 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),) ifneq ($(CLONE_FROM_USER),)
export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER) export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)