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

make: Replace direct invocations of ssh by $(CVS_RSH)

Browse source
This commit is contained in:
Jan Lindemann 2007-08-23 10:57:38 +00:00 • committed by Jan Lindemann
commit 3b954bc5c1
8 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make/defs.mk
View file

@ -37,6 +37,7 @@ LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//") LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
MAJOR_MINOR_RELEASE = $(shell echo $(DIST_VERSION) | cut -d- -f1) MAJOR_MINOR_RELEASE = $(shell echo $(DIST_VERSION) | cut -d- -f1)
BUILD_NUMBER = $(shell echo $(DIST_VERSION) | cut -d- -f2) BUILD_NUMBER = $(shell echo $(DIST_VERSION) | cut -d- -f2)
CVS_RSH ?= /usr/bin/ssh
# ----- input dirs # ----- input dirs
MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/devutil/scripts $(MODDIR)/bin)) MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/devutil/scripts $(MODDIR)/bin))

12
make/dist.mk
View file

@ -71,18 +71,18 @@ build.dist: $(DIST_FILE)
# -- install.dist # -- install.dist
install.dist: $(DIST_FILE) $(SSI_PREFIX)_$(PROJECT)_$(DIST_VERSION).html install.dist: $(DIST_FILE) $(SSI_PREFIX)_$(PROJECT)_$(DIST_VERSION).html
@echo "-- installing distribution files to $(TARGET_HOST):$(TARGET_DIR) as user $(TARGET_USER)" @echo "-- installing distribution files to $(TARGET_HOST):$(TARGET_DIR) as user $(TARGET_USER)"
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
mkdir -p $(TARGET_DIR); chmod $(TARGET_DIR_MODE) $(TARGET_DIR)" mkdir -p $(TARGET_DIR); chmod $(TARGET_DIR_MODE) $(TARGET_DIR)"
/usr/bin/rsync -az -v --links -e /usr/bin/ssh $(DIST_FILE) $(TARGET_USER)@$(TARGET_HOST):$(TARGET_DIR) /usr/bin/rsync -az -v --links -e $(CVS_RSH) $(DIST_FILE) $(TARGET_USER)@$(TARGET_HOST):$(TARGET_DIR)
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
cd $(TARGET_DIR); find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" cd $(TARGET_DIR); find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)"
@echo "-- installing referrer include files to $(TARGET_HOST) as user $(TARGET_USER)" @echo "-- installing referrer include files to $(TARGET_HOST) as user $(TARGET_USER)"
for DIR in $(DOWNLOAD_REFERRER_DIRS) ; do \ for DIR in $(DOWNLOAD_REFERRER_DIRS) ; do \
echo "to $$DIR" ;\ echo "to $$DIR" ;\
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
mkdir -p $$DIR; chmod $(TARGET_DIR_MODE) $(TARGET_DIR)" ;\ mkdir -p $$DIR; chmod $(TARGET_DIR_MODE) $(TARGET_DIR)" ;\
/usr/bin/rsync -az -v --links -e /usr/bin/ssh $(TMPHTML)/ssi_download_*.html $(TARGET_USER)@$(TARGET_HOST):$$DIR ;\ /usr/bin/rsync -az -v --links -e $(CVS_RSH) $(TMPHTML)/ssi_download_*.html $(TARGET_USER)@$(TARGET_HOST):$$DIR ;\
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
cd $$DIR; find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" ;\ cd $$DIR; find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" ;\
done done

10
make/linux-rpm-build.mk
View file

@ -176,7 +176,7 @@ copy-devel.done: $(F_RPM_DEVEL)
ping: ping:
ping $(HOST) ping $(HOST)
ssh: ssh:
ssh -l root $(HOST) $(CVS_RSH) -l root $(HOST)
# user targets # user targets
unpack: unpack.done unpack: unpack.done
@ -193,13 +193,13 @@ copy-devel: copy-devel.done
copy: copy-run copy-devel copy: copy-run copy-devel
patch: patches.done patch: patches.done
shutdown: shutdown:
ssh -l root $(HOST) "shutdown -h now" $(CVS_RSH) -l root $(HOST) "shutdown -h now"
reboot: reboot:
ssh -l root $(HOST) "reboot" -l root $(HOST) "reboot"
update-rpm: copy update-rpm: copy
ssh -l root $(HOST) rpm -U $(addprefix rpm/,$(F_RPMS)) $(CVS_RSH) -l root $(HOST) rpm -U $(addprefix rpm/,$(F_RPMS))
erase-rpm: erase-rpm:
ssh -l root $(HOST) rpm -e $(KERNEL_BASE)-run $(KERNEL_BASE)-devel $(CVS_RSH) -l root $(HOST) rpm -e $(KERNEL_BASE)-run $(KERNEL_BASE)-devel
dist: clean dist: clean
cd ..;\ cd ..;\
tar -czf kernel.tar.gz `find kernel -maxdepth 1 -type f | grep -ve "setup\|trash\|CVS"` tar -czf kernel.tar.gz `find kernel -maxdepth 1 -type f | grep -ve "setup\|trash\|CVS"`

2
make/rpmdist.mk
View file

@ -136,7 +136,7 @@ upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
touch $@ touch $@
update-repo.dist: upload.dist update-repo.dist: upload.dist
ssh -l root $(FTP_HOST) /etc/cron.hourly/create_packet_descriptions.sh $(CVS_RSH) -l root $(FTP_HOST) /etc/cron.hourly/create_packet_descriptions.sh
touch $@ touch $@
# ------ hash stuff # ------ hash stuff

2
make/smart-selection.mk
View file

@ -39,7 +39,7 @@ channels.done: $(MODDIR)/make/smart-selection.mk
upload.done: selection.done upload.done: selection.done
sh $(UPLOAD_SH) $(SELECTION) $(CHANNEL_LIST) $(UPLOAD_URL) sh $(UPLOAD_SH) $(SELECTION) $(CHANNEL_LIST) $(UPLOAD_URL)
ssh -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh $(CVS_RSH) -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh
touch $@ touch $@
rpm-install-smart.done: rpm-install-smart.done:

2
make/suse-selection.mk
View file

@ -17,5 +17,5 @@ clean:
upload.done: $(SELECTION) upload.done: $(SELECTION)
sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL) sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL)
ssh -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh $(CVS_RSH) -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh
touch $@ touch $@

6
make/tex.mk
View file

@ -278,10 +278,10 @@ $(OUT).pdf.zip: $(OUTPUT).pdf
html_install: $(HTMLDIR) html_install: $(HTMLDIR)
@echo "-- installing html to $(TARGET_HOST):$(TARGET_DIR) as user $(TARGET_USER)" @echo "-- installing html to $(TARGET_HOST):$(TARGET_DIR) as user $(TARGET_USER)"
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
mkdir -p $(TARGET_DIR); chmod $(TARGET_DIR_MODE) $(TARGET_DIR)" mkdir -p $(TARGET_DIR); chmod $(TARGET_DIR_MODE) $(TARGET_DIR)"
/usr/bin/rsync -az --delete -v --links -e /usr/bin/ssh $(HTMLDIR)/* $(TARGET_USER)@$(TARGET_HOST):$(TARGET_DIR) /usr/bin/rsync -az --delete -v --links -e $(CVS_RSH) $(HTMLDIR)/* $(TARGET_USER)@$(TARGET_HOST):$(TARGET_DIR)
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
cd $(TARGET_DIR); find . -type d | xargs chmod $(TARGET_DIR_MODE); find . -type f | xargs chmod $(TARGET_FILE_MODE)" cd $(TARGET_DIR); find . -type d | xargs chmod $(TARGET_DIR_MODE); find . -type f | xargs chmod $(TARGET_FILE_MODE)"
clean: clean:

12
make/upload.mk
View file

@ -102,18 +102,18 @@ ssi_build.dist:
# -- install.dist # -- install.dist
install.dist: $(PCKG_FILES) ssi_build.dist install.dist: $(PCKG_FILES) ssi_build.dist
@echo "-- installing distribution files to $(TARGET_HOST):$(TARGET_DIR) as user $(TARGET_USER)" @echo "-- installing distribution files to $(TARGET_HOST):$(TARGET_DIR) as user $(TARGET_USER)"
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
mkdir -p $(TARGET_DIR); chmod $(TARGET_DIR_MODE) $(TARGET_DIR)" mkdir -p $(TARGET_DIR); chmod $(TARGET_DIR_MODE) $(TARGET_DIR)"
/usr/bin/rsync -az -v --links -e /usr/bin/ssh $(PCKG_FILES) $(TARGET_USER)@$(TARGET_HOST):$(TARGET_DIR) /usr/bin/rsync -az -v --links -e $(CVS_RSH) $(PCKG_FILES) $(TARGET_USER)@$(TARGET_HOST):$(TARGET_DIR)
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
cd $(TARGET_DIR); find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" cd $(TARGET_DIR); find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)"
@echo "-- installing referrer include files to $(TARGET_HOST) as user $(TARGET_USER)" @echo "-- installing referrer include files to $(TARGET_HOST) as user $(TARGET_USER)"
for DIR in $(DOWNLOAD_REFERRER_DIRS) ; do \ for DIR in $(DOWNLOAD_REFERRER_DIRS) ; do \
echo "to $$DIR" ;\ echo "to $$DIR" ;\
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
mkdir -p $$DIR; chmod $(TARGET_DIR_MODE) $(TARGET_DIR)" ;\ mkdir -p $$DIR; chmod $(TARGET_DIR_MODE) $(TARGET_DIR)" ;\
/usr/bin/rsync -az -v --links -e /usr/bin/ssh $(TMPHTML)/ssi_download_*.html $(TARGET_USER)@$(TARGET_HOST):$$DIR ;\ /usr/bin/rsync -az -v --links -e $(CVS_RSH) $(TMPHTML)/ssi_download_*.html $(TARGET_USER)@$(TARGET_HOST):$$DIR ;\
ssh -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
cd $$DIR; find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" ;\ cd $$DIR; find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" ;\
done done