janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects-dir.mk, projs-dir.mk, pgit.sh: Set CVS_RSH unconditionally to wrapper

Browse source 
Problem is, the OS cvs package sets the environment variable to "ssh"
in a profile script. Overriding this to speed things up.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-12 18:21:20 +00:00
commit 8477f45390
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
make/projects-dir.mk
View file

@ -39,16 +39,11 @@ ifeq ($(JANWARE_USER),)
export JANWARE_USER = $(shell id -un) export JANWARE_USER = $(shell id -un)
endif endif
CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs
export CVS_RSH := $(CWD)/ssh-wrapper.sh
ifeq ($(CVS_RSH),) export GIT_SSH := $(CVS_RSH)
export CVS_RSH := ./ssh-wrapper.sh
endif
ifeq ($(GIT_SSH),)
export GIT_SSH := $(CVS_RSH)
endif
export JW_BUILD_SSH_EXTRA_OPTS = -o ControlMaster=auto -o ControlPath=/tmp/%r@build:%p -o ControlPersist=3m export JW_BUILD_SSH_EXTRA_OPTS = -o ControlMaster=auto -o ControlPath=/tmp/%r@build:%p -o ControlPersist=3m
ifneq ($(CLONE_FROM_USER),) ifneq ($(CLONE_FROM_USER),)
@ -106,7 +101,7 @@ init-project-%:
$(CREATE_PROJECT_SH) $* $(CREATE_PROJECT_SH) $*
doc-project doc-module: doc-project doc-module:
$(BROWSER) $(firstword $(shell sed '/https:/ !d; s%.*https%https%; s/ .*//' $(firstword $(MAKEFILE_LIST)))) $(BROWSER) $(firstword $(shell sed '/https:/ !d; s%.*https%https%; s/ .*//' $(lastword $(MAKEFILE_LIST))))
pkg-%: pull.done pkg-%: pull.done
$(BUILD_PY) $@ $(BUILD_PROJECTS) $(BUILD_PY) $@ $(BUILD_PROJECTS)

2
scripts/pgit.sh
View file

@ -41,7 +41,7 @@ run()
config config
cd $pdir cd $pdir
#set -e set -e
for d in $pdirs; do for d in $pdirs; do
marker $d marker $d
git -C $d $cmd "$@" git -C $d $cmd "$@"