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

git-submod.mk, topdir.mk: Replace git.jannet.de by git.janware.com

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-11-11 15:07:39 +00:00
commit 567dc2295a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/git-submod.mk
View file

@ -4,8 +4,8 @@
# - include <path-to-this-makefile> # - include <path-to-this-makefile>
# - run git-init-submod-remote # - run git-init-submod-remote
GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh
GIT_REPO_URL = ssh://$(JANWARE_USER)@git.jannet.de/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME) GIT_REPO_URL = ssh://$(JANWARE_USER)@git.janware.com/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME)
SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(PWD))/$(SUBMOD_SRC_DIR))) SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(PWD))/$(SUBMOD_SRC_DIR)))
SUBMOD_SRC_DIR ?= . SUBMOD_SRC_DIR ?= .
SUB_GIT = git -C $(SUBMOD_SRC_DIR) SUB_GIT = git -C $(SUBMOD_SRC_DIR)

6
make/topdir.mk
View file

@ -28,7 +28,7 @@ endif
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT) REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT)
REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.jannet.de$(REMOTE_GIT_DIR) REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.janware.com$(REMOTE_GIT_DIR)
include $(MODDIR)/make/dirs.mk include $(MODDIR)/make/dirs.mk
include $(MODDIR)/make/rpmdist.mk include $(MODDIR)/make/rpmdist.mk
@ -113,7 +113,7 @@ git-config:
git remote set-url --push origin $(REMOTE_GIT_URL) git remote set-url --push origin $(REMOTE_GIT_URL)
git-clone-to-remote: git-clone-to-remote:
ssh git.jannet.de "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(RPM_PROJECT)" ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(RPM_PROJECT)"
git remote set-url --push origin $(REMOTE_GIT_URL) git remote set-url --push origin $(REMOTE_GIT_URL)
git push --set-upstream origin master git push --set-upstream origin master
git push --all $(REMOTE_GIT_URL) git push --all $(REMOTE_GIT_URL)
@ -128,7 +128,7 @@ git-init-remote: git-import git-clone-to-remote
git-descr: $(GIT_DESCR) git-descr: $(GIT_DESCR)
git-update-project-description: git-update-project-description:
ssh git.jannet.de "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(RPM_PROJECT)" ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(RPM_PROJECT)"
projects-%: projects-%:
python2 $(MOD_SCRIPT_DIR)/projects.py build $* $(RPM_PROJECT) python2 $(MOD_SCRIPT_DIR)/projects.py build $* $(RPM_PROJECT)