From 125cf84e395caca699d1935aa245cf75fbd6ed99 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 19 Dec 2007 20:52:10 +0000 Subject: [PATCH] make: Fix UPDATE_REPO_SH --- make/defs.mk | 1 + make/rpmdist.mk | 2 +- make/smart-selection.mk | 2 +- make/suse-selection.mk | 8 ++++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index c7c2cee8..3b3fca0b 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -139,6 +139,7 @@ LD_VERSION = $(shell ld --version | sed '/GNU ld/ !d; s/[^0-9]*\([0- LD_MAJOR = $(shell echo $(LD_VERSION) | cut -d. -f1) LD_MINOR = $(shell echo $(LD_VERSION) | cut -d. -f2) LD_REV = $(shell echo $(LD_VERSION) | cut -d. -f3) +UPDATE_REPO_SH = /opt/ytools/bin/create_packet_descriptions.sh #ifndef $(TOPDIR) # TOPDIR := $(MODDIR) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 871c6ffd..c7a81a7a 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -127,7 +127,7 @@ upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386 touch $@ update-repo.dist: upload.dist - $(CVS_RSH) -l root $(FTP_HOST) /etc/cron.hourly/create_packet_descriptions.sh + $(CVS_RSH) -l root $(FTP_HOST) $(UPDATE_REPO_SH) touch $@ # ------ hash stuff diff --git a/make/smart-selection.mk b/make/smart-selection.mk index b1ce2ed6..ccf0837a 100644 --- a/make/smart-selection.mk +++ b/make/smart-selection.mk @@ -39,7 +39,7 @@ channels.done: $(MODDIR)/make/smart-selection.mk upload.done: selection.done sh $(UPLOAD_SH) $(SELECTION) $(CHANNEL_LIST) $(UPLOAD_URL) - $(CVS_RSH) -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh + $(CVS_RSH) -l root ftp.jannet.de $(UPDATE_REPO_SH) touch $@ rpm-install-smart.done: diff --git a/make/suse-selection.mk b/make/suse-selection.mk index 347fc35e..8bf76c64 100644 --- a/make/suse-selection.mk +++ b/make/suse-selection.mk @@ -1,4 +1,8 @@ -MOD_SCRIPT_DIR = $(HOME)/local/src/cvs.main/lib/devutil/scripts +MODDIR = $(HOME)/local/src/cvs.main/proj/ytools +include $(MODDIR)/make/defs.mk + +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 @@ -17,5 +21,5 @@ clean: upload.done: $(SELECTION) sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL) - $(CVS_RSH) -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh + $(CVS_RSH) -l root ftp.jannet.de $(UPDATE_REPO_SH) touch $@