From 90157c680297769612b5eec93090e8b08f8b9594 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 27 Nov 2016 15:55:08 +0000 Subject: [PATCH] topdir.mk: Add support for OPT_JANWARE_PROJECT Signed-off-by: Jan Lindemann --- make/topdir.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/make/topdir.mk b/make/topdir.mk index 38ef5614..3494c84f 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -11,7 +11,17 @@ SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \ PROJECT_DESCR = $(TOPDIR)/make/project.conf GIT_DESCR = $(TOPDIR)/.git/description WHOAMI = $(shell whoami) -REMOTE_GIT_DIR = /srv/git/$(WHOAMI)/proj/$(RPM_PROJECT) + +OPT_JANWARE_PROJECT ?= -j + +ifeq ($(OPT_JANWARE_PROJECT),-j) +REMOTE_GIT_FLAVOUR ?= proj +else +OPT_JANWARE_PROJECT = +REMOTE_GIT_FLAVOUR ?= priv +endif + +REMOTE_GIT_DIR = /srv/git/$(WHOAMI)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT) REMOTE_GIT_URL = ssh://$(WHOAMI)@git.jannet.de$(REMOTE_GIT_DIR) @@ -103,7 +113,7 @@ git-config: git remote set-url --push origin $(REMOTE_GIT_URL) git-clone-to-remote: - ssh git.jannet.de "/opt/ytools/bin/git-srv-admin.sh -j create-personal-project $(RPM_PROJECT)" + ssh git.jannet.de "/opt/ytools/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(RPM_PROJECT)" git remote set-url --push origin $(REMOTE_GIT_URL) git push --set-upstream origin master git push --all $(REMOTE_GIT_URL)