From 4d9d10540bbeae67591e535259658dc800e09eef Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 13 Mar 2019 12:37:25 +0000 Subject: [PATCH] topdir.mk: Use $(PROJECT) instead of $(RPM_PROJECT) for git Identify the remote's name by $(PROJECT) instead of $(RPM_PROJECT) now. Don't know the exact rationale for $(RPM_PROJECT), but in case of arm-none-eabi-mcu-blink it was certainly wrong. Signed-off-by: Jan Lindemann --- make/topdir.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/make/topdir.mk b/make/topdir.mk index 505521c9..309006f7 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -30,7 +30,7 @@ endif 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)/$(PROJECT) REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.janware.com$(REMOTE_GIT_DIR) include $(MODDIR)/make/dirs.mk @@ -138,7 +138,8 @@ git-config: git remote set-url --push origin $(REMOTE_GIT_URL) git-clone-to-remote: - ssh git.janware.com "/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 $(PROJECT)" + git remote add origin $(REMOTE_GIT_URL) git remote set-url --push origin $(REMOTE_GIT_URL) git push --set-upstream origin master git push --all $(REMOTE_GIT_URL) @@ -154,10 +155,10 @@ git-init-remote: git-import git-clone-to-remote git-descr: $(GIT_DESCR) git-update-project-description: - ssh git.janware.com "/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 $(PROJECT)" projects-%: - python2 $(MOD_SCRIPT_DIR)/projects.py build $* $(RPM_PROJECT) + python2 $(MOD_SCRIPT_DIR)/projects.py build $* $(PROJECT) install-deps-devel: sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")