From 1430a0cd91c5b0f7064b500a7fccc1ac37912056 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 24 Jul 2002 14:08:14 +0000 Subject: [PATCH] rpmdist.mk, ytools.mk.in: Add FTP_FILE_MODE and FTP_DIR_MODE --- make/rpmdist.mk | 24 ++++++++++++++++-------- make/ytools.mk.in | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 67da3350..e86631ca 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -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') diff --git a/make/ytools.mk.in b/make/ytools.mk.in index ac75c5e7..a565442f 100644 --- a/make/ytools.mk.in +++ b/make/ytools.mk.in @@ -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