mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
rpmdist.mk, ytools.mk.in: Add FTP_FILE_MODE and FTP_DIR_MODE
This commit is contained in:
parent
a91f890fee
commit
1430a0cd91
2 changed files with 18 additions and 8 deletions
|
|
@ -4,6 +4,14 @@ ifeq ($(RPM_PROJECT),)
|
|||
RPM_PROJECT = $(PROJECT)
|
||||
endif
|
||||
|
||||
ifndef FTP_FILE_MODE
|
||||
FTP_FILE_MODE = 640
|
||||
endif
|
||||
|
||||
ifndef FTP_DIR_MODE
|
||||
FTP_DIR_MODE = 750
|
||||
endif
|
||||
|
||||
RPM_VERSION := $(shell cat VERSION | sed -e s'/-dev//')
|
||||
|
||||
CLEAN += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
|
||||
|
|
@ -22,14 +30,14 @@ CURRENT_RPM_DEVEL_I386 = $(PCKG_ROOT)/rpm/devel/$(PCKG_RPM_DEVEL_I386)
|
|||
CURRENT_RPM_SRC = $(PCKG_ROOT)/rpm/src/$(PCKG_RPM_SRC)
|
||||
REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/usr/local/ftp
|
||||
REMOTE_TARGETS = \
|
||||
$(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):640:750:$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_SRC:640:750:$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):640:750:$(FTP_RUN_USER).$(FTP_RUN_GROUP)\
|
||||
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_RUN_I386:640:750:$(FTP_RUN_USER).$(FTP_RUN_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):640:750:$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_DEVEL_I386:640:750:$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):640:750:$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_SRC:640:750:$(FTP_SRC_USER).$(FTP_SRC_GROUP)
|
||||
$(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/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)$(PCKG_ROOT)/CURRENT_RPM_RUN_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_DEVEL_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
|
||||
$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_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)
|
||||
|
||||
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ FTP_RUN_USER = jan
|
|||
FTP_DEV_GROUP = ytdev
|
||||
FTP_DEV_USER = jan
|
||||
FTP_HOST = ftp.jannet.de
|
||||
FTP_FILE_MODE = 644
|
||||
FTP_DIR_MODE = 755
|
||||
#FTP_HOST = ftp.jannet.de
|
||||
FTP_HOST_LOGIN = root
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue