From 2f29b9c14be3ada3ee1a7b524614fe150af1a1df Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 21 Mar 2014 17:54:31 +0000 Subject: [PATCH] make: Fix remote ftp path (/home/ftp/dat -> /srv/ftp) Signed-off-by: Jan Lindemann --- make/defs.mk | 6 +++--- make/linux-rpm-build.mk | 2 +- make/smart-selection.mk | 2 +- make/suse-selection.mk | 2 +- make/upload-defs-rpm.mk | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 66b4ae58..04eb0059 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -248,9 +248,9 @@ ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP) ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) FTP_PCKG_DIR = /pub/packages -JANNET_PROJ_DIR = rsync_ssh://ftp.jannet.de:/home/ftp/dat$(FTP_PCKG_DIR) -UPLOAD_URL_RPM_BIN = rsync_ssh://ftp.jannet.de:/home/ftp/dat/pub/packages/rpm/bin/ -UPLOAD_URL_RPM_SRC = rsync_ssh://ftp.jannet.de:/home/ftp/dat/pub/packages/rpm/src/ +JANNET_PROJ_DIR = rsync_ssh://ftp.jannet.de:/srv/ftp$(FTP_PCKG_DIR) +UPLOAD_URL_RPM_BIN = rsync_ssh://ftp.jannet.de:/srv/ftp/pub/packages/rpm/bin/ +UPLOAD_URL_RPM_SRC = rsync_ssh://ftp.jannet.de:/srv/ftp/pub/packages/rpm/src/ PUBLIC_PATH_DEVEL_DOC = /proj/devel-docs UPLOAD_URL_DEVEL_DOC = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC) diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk index 2edae024..4412b5ba 100644 --- a/make/linux-rpm-build.mk +++ b/make/linux-rpm-build.mk @@ -14,7 +14,7 @@ CUSTOMER ?= jannet KERNEL_DLOAD_DIR ?= /home/samba/dat/exe/linux/os KERNEL_PKG ?= $(KERNEL_DLOAD_DIR)/$(shell echo $(KERNEL_VERSION) | $(SED) 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(shell echo $(KERNEL_VERSION) | $(SED) 's/\(2\.6\.[0-9]+\)-..*/\1/')$(KERNEL_PKG_SUFFIX) UPLOAD_HOST ?= ftp.jannet.de -UPLOAD_PATH ?= /home/ftp/dat/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) +UPLOAD_PATH ?= /srv/ftp/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) UPLOAD_OWNER ?= $(shell whoami) KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) diff --git a/make/smart-selection.mk b/make/smart-selection.mk index 8fd3dcb9..8fbdd210 100644 --- a/make/smart-selection.mk +++ b/make/smart-selection.mk @@ -5,7 +5,7 @@ UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1) DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-) -UPLOAD_URL = root@ftp.jannet.de:/home/ftp/dat/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/setup/descr +UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/setup/descr SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt diff --git a/make/suse-selection.mk b/make/suse-selection.mk index 8bf76c64..df428618 100644 --- a/make/suse-selection.mk +++ b/make/suse-selection.mk @@ -5,7 +5,7 @@ MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh SUSE_RELEASE = 10.1 -UPLOAD_URL = root@ftp.jannet.de:/home/ftp/dat/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr +UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk index 7f44bd3a..5994dd4d 100644 --- a/make/upload-defs-rpm.mk +++ b/make/upload-defs-rpm.mk @@ -21,7 +21,7 @@ CURRENT_SRC = $(PCKG_ROOT)/src/$(PCKG_TAR) CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/rpm/run/$(PCKG_RPM_RUN_I386) 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):/home/ftp/dat +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)$(PCKG_ROOT)/CURRENT_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \