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

upload-defs-rpm.mk: Weed out outdated stuff

Browse source 
Move the necessary definitions into rpmdist.mk and disable the rest
in upload-defs-rpm.mk. Can be removed as soon as the stuff is tested
to work well.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-12-03 12:51:03 +00:00
commit f3caef9690
2 changed files with 43 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

68
make/upload-defs-rpm.mk
View file

@ -3,41 +3,41 @@
# VERSION
# MOD_SCRIPT_DIR
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
#UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
#MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
FTP_FILE_MODE ?= 640
FTP_DIR_MODE ?= 750
FTP_SRC_GROUP ?= spidsrc
FTP_SRC_USER ?= $(shell whoami)
FTP_RUN_GROUP ?= spidrun
FTP_RUN_USER ?= $(shell whoami)
FTP_DEV_GROUP ?= spiddev
FTP_DEV_USER ?= $(shell whoami)
FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root
OS_NAME = $(shell echo $(OS) | sed 's/-.*//')
OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//')
# $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/inst-source/rpm/src
FTP_PCKG_DIR = /pub/packages
PCKG_ROOT = $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/inst-source
#PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
CURRENT_SRC = $(PCKG_ROOT)/tgz/$(PCKG_TAR)
CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_RUN_I386)
CURRENT_RPM_DEVEL_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_DEVEL_I386)
CURRENT_RPM_SRC = $(PCKG_ROOT)/src/$(PCKG_RPM_SRC)
REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/srv/ftp
REMOTE_TARGETS = \
$(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP)\
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP)
ifeq ($(CREATE_DEVEL),true)
REMOTE_TARGETS += \
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP)
endif
#FTP_FILE_MODE ?= 640
#FTP_DIR_MODE ?= 750
#FTP_SRC_GROUP ?= spidsrc
#FTP_SRC_USER ?= $(shell whoami)
#FTP_RUN_GROUP ?= spidrun
#FTP_RUN_USER ?= $(shell whoami)
#FTP_DEV_GROUP ?= spiddev
#FTP_DEV_USER ?= $(shell whoami)
#FTP_HOST ?= ftp.jannet.de
#FTP_HOST_LOGIN ?= root
#
#OS_NAME = $(shell echo $(OS) | sed 's/-.*//')
#OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//')
#
## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/inst-source/rpm/src
#FTP_PCKG_DIR ?= /pub/packages
#PCKG_ROOT ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/inst-source
##PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
#CURRENT_SRC = $(warning PCKG_ROOT=$(PCKG_ROOT))$(PCKG_ROOT)/tgz/$(PCKG_TAR)
#CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_RUN_I386)
#CURRENT_RPM_DEVEL_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_DEVEL_I386)
#CURRENT_RPM_SRC = $(PCKG_ROOT)/src/$(PCKG_RPM_SRC)
#REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/srv/ftp
#REMOTE_TARGETS = \
# $(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP)\
# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP)
#
#ifeq ($(CREATE_DEVEL),true)
#REMOTE_TARGETS += \
# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP)
#endif
# $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
# $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP)