From f4efde33778c2ee9f9416ff2b0140d54f9c7b012 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 16 Dec 2018 16:11:11 +0000 Subject: [PATCH] $(TOPDIR), make, scripts: Ftp.jannet.de / ftp.janware.com -> pkg.janware.com Signed-off-by: Jan Lindemann --- Makefile | 2 +- make/linux-rpm-build.mk | 4 +- make/rpmdist.mk | 7 ++-- make/smart-selection.mk | 6 +-- make/suse-selection.mk | 4 +- make/upload-defs-rpm.mk | 2 +- scripts/integrate-distro.sh | 3 +- scripts/jannet | 19 ++++----- scripts/jw-pkg | 84 +++++++++++++++++-------------------- scripts/pkg.sh | 4 +- scripts/upload.sh | 2 +- 11 files changed, 61 insertions(+), 76 deletions(-) diff --git a/Makefile b/Makefile index caf97bda..8f37c883 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ TOPDIR = . SUBDIRS = make scripts bin htdocs tmpl conf -RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@ftp.janware.com:/srv/ftp/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) +RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@pkg.janware.com:/srv/ftp/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) include $(TOPDIR)/make/proj.mk include $(MODDIR)/make/topdir.mk diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk index a76785bb..662febfb 100644 --- a/make/linux-rpm-build.mk +++ b/make/linux-rpm-build.mk @@ -13,8 +13,8 @@ KERNEL_PKG_SUFFIX ?= .tar.gz 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 ?= /srv/ftp/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) +UPLOAD_HOST ?= pkg.janware.com +UPLOAD_PATH ?= /srv/dav/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) UPLOAD_OWNER ?= $(shell whoami) KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 6f0837ec..76e38846 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -10,10 +10,9 @@ FTP_RUN_GROUP ?= $(shell id -g) FTP_RUN_USER ?= $(shell whoami) FTP_DEV_GROUP ?= $(shell id -g) FTP_DEV_USER ?= $(shell whoami) -FTP_HOST ?= ftp.jannet.de +FTP_HOST ?= pkg.janware.com FTP_FILE_MODE ?= 644 FTP_DIR_MODE ?= 755 -FTP_HOST ?= ftp.jannet.de FTP_HOST_LOGIN ?= root RPM_VERSION ?= $(DIST_VERSION) RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX) @@ -24,7 +23,7 @@ CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true HASH = $(shell $(cvs_files) -z | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \ xargs -0 md5sum | md5sum | $(SED) 's/ .*//') -LOCAL_REPO ?= /srv/ftp/pub/local/packages/suse/11.4 +LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS) include $(MODDIR)/make/tag-defs.mk @@ -78,7 +77,7 @@ RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-versi RPM_UPLOAD_OS_NAME = $(shell echo $(OS) | sed 's/-.*//') RPM_UPLOAD_OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//') -RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) +RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) RPM_UPLOAD_USER ?= $(shell id -un) RPM_UPLOAD_GROUP ?= $(shell id -gn) RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP) diff --git a/make/smart-selection.mk b/make/smart-selection.mk index 314dff69..f627f041 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:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/setup/descr +UPLOAD_URL = root@pkg.janware.com:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/setup/descr SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt @@ -40,12 +40,12 @@ 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 $(UPDATE_REPO_SH) + $(CVS_RSH) -l root pkg.janware.com $(UPDATE_REPO_SH) touch $@ rpm-install-smart.done: if ! rpm -q smart >/dev/null 2>&1 ; then \ - wget ftp.jannet.de:/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/rpm/i686/smart.rpm; \ + wget --http-user=$(JANWARE_USER) https://janware.com:/files/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/rpm/i686/smart.rpm; \ sudo rpm -U smart.rpm; \ sudo smart update; \ sudo smart channel --remove-all; \ diff --git a/make/suse-selection.mk b/make/suse-selection.mk index e0345816..2d5383c6 100644 --- a/make/suse-selection.mk +++ b/make/suse-selection.mk @@ -3,7 +3,7 @@ include $(MODDIR)/make/defs.mk GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh SUSE_RELEASE = 10.1 -UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr +UPLOAD_URL = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel @@ -19,5 +19,5 @@ clean: upload.done: $(SELECTION) sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL) - $(CVS_RSH) -l root ftp.jannet.de $(UPDATE_REPO_SH) + $(CVS_RSH) -l root pkg.janware.com $(UPDATE_REPO_SH) touch $@ diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk index 95644523..65bfd54b 100644 --- a/make/upload-defs-rpm.mk +++ b/make/upload-defs-rpm.mk @@ -14,7 +14,7 @@ #FTP_RUN_USER ?= $(shell whoami) #FTP_DEV_GROUP ?= spiddev #FTP_DEV_USER ?= $(shell whoami) -#FTP_HOST ?= ftp.jannet.de +#FTP_HOST ?= pkg.janware.com #FTP_HOST_LOGIN ?= root # #OS_NAME = $(shell echo $(OS) | sed 's/-.*//') diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 792394a0..eaa4b8c7 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -616,8 +616,7 @@ cfg_default() #update 0 ftp://ftp/pub/mirror/suse/update/$suse_version [repos.payload] - #ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version - ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version + jw-foss 10 https://pkg:we0rntj3p@janware.com/files/packages/jw-foss/suse/$suse_version?auth=basic&credentials=jannet.cat ftp.priv.lcl 5 ftp://dspdev:123qweasd@ftp.priv.lcl/pub/local/packages/suse/$suse_version [repos.special] diff --git a/scripts/jannet b/scripts/jannet index 08588fa5..435a7f0b 100644 --- a/scripts/jannet +++ b/scripts/jannet @@ -155,32 +155,32 @@ get_opts $* case $cmd in init) - if ! channel_present ftp.jannet.de; then + if ! channel_present jw-foss; then echo -n "adding installation source ... " - sudo smart channel -y --add ftp.jannet.de \ + sudo smart channel -y --add jw-foss \ type=yast2 \ - baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \ + baseurl=https://pkg:we0rntj3p@janware.com/files/packages/jw-foss/suse/tumbleweed?auth=basic&credentials=jannet.cat \ >/dev/null 2>&1 if channel_present; then echo done; else echo failed; fi fi ;; uninit) - if channel_present ftp.jannet.de; then + if channel_present jw-foss; then echo -n "removing installation source ... " - sudo smart channel -y --remove ftp.jannet.de >/dev/null 2>&1 + sudo smart channel -y --remove jw-foss >/dev/null 2>&1 echo done fi ;; update) - sudo smart update ftp.jannet.de + sudo smart update jw-foss sudo smart upgrade -y check_ldconfig ;; install) - sudo smart update ftp.jannet.de + sudo smart update jw-foss if [ -f $1 ]; then sudo smart install -y `cat $1` else @@ -202,11 +202,6 @@ info) list_all_packages | xargs rpm -q fi ;; -cpp-glib) - sudo rpm -U --replacefiles --replacepkgs --oldpackage \ - ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/rpm/i586/glib2-2.8.5-19.i586.rpm - check_ldconfig - ;; rpmnew) cmd_rpmnew $@ ;; diff --git a/scripts/jw-pkg b/scripts/jw-pkg index f6709519..dccc8cf1 100644 --- a/scripts/jw-pkg +++ b/scripts/jw-pkg @@ -353,47 +353,44 @@ shift case $cmd in -init) - if ! channel_present ftp.jannet.de; then - echo -n "adding installation source ... " - sudo smart channel -y --add ftp.jannet.de \ - type=yast2 \ - baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \ - >/dev/null 2>&1 - if channel_present; then echo done; else echo failed; fi - fi - ;; - -uninit) - if channel_present ftp.jannet.de; then - echo -n "removing installation source ... " - sudo smart channel -y --remove ftp.jannet.de >/dev/null 2>&1 - echo done - fi - ;; - -update) - sudo smart update ftp.jannet.de - sudo smart upgrade -y - check_ldconfig - ;; - -install) - sudo smart update ftp.jannet.de - if [ -f $1 ]; then - sudo smart install -y `cat $1` - else - sudo smart install -y $* - fi - check_ldconfig - ;; -restore) - echo "not yet implemented, sorry" >&2 - ;; -checklog) - line=`jannet info | tr -s " "` - echo $line - ;; +# -- TODO: re-implement this using pkg-manager.sh, or integrate with pkg-manager.sh +#init) +# if ! channel_present ftp.jannet.de; then +# echo -n "adding installation source ... " +# sudo smart channel -y --add ftp.jannet.de \ +# type=yast2 \ +# baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \ +# >/dev/null 2>&1 +# if channel_present; then echo done; else echo failed; fi +# fi +# ;; +# +#uninit) +# if channel_present ftp.jannet.de; then +# echo -n "removing installation source ... " +# sudo smart channel -y --remove ftp.jannet.de >/dev/null 2>&1 +# echo done +# fi +# ;; +# +#update) +# sudo smart update ftp.jannet.de +# sudo smart upgrade -y +# check_ldconfig +# ;; +# +#install) +# sudo smart update ftp.jannet.de +# if [ -f $1 ]; then +# sudo smart install -y `cat $1` +# else +# sudo smart install -y $* +# fi +# check_ldconfig +# ;; +#restore) +# echo "not yet implemented, sorry" >&2 +# ;; list) if [ "$opt_verbose" = true ]; then list_packages "$@" | xargs -r rpm -qi @@ -404,11 +401,6 @@ list) list_projects) list_projects "$@" ;; -cpp_glib) - sudo rpm -U --replacefiles --replacepkgs --oldpackage \ - ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/rpm/i586/glib2-2.8.5-19.i586.rpm - check_ldconfig "$@" - ;; compile_templates|list_templates|list_template_tables|list_template_output|rm_template_output|diff|build_date|built_today|rpmnew) cmd_$cmd "$@" ;; diff --git a/scripts/pkg.sh b/scripts/pkg.sh index 53e55771..156b66e8 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -522,7 +522,7 @@ upload_file() } local os_name=`os | sed 's/-.*//'` local os_version=`os | sed 's/[^-]\+-//'` - local target_base=rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$os_name/$os_version + local target_base=rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$os_name/$os_version [ "$upload_urlbase" ] && target_base="$upload_urlbase" local upload_attrib=644:755:`id -un`.207 [ "$upload_file_attrib" ] && upload_attrib="$upload_file_attrib" @@ -569,7 +569,7 @@ upload_pkg() local h=`calculate_hash` case $PKG_FORMAT in rpm) - server=ftp.jannet.de + server=pkg.janware.com upload_file $RPM_PROJECT-$v.tar.bz2 tgz upload_file $RPM_PROJECT-$v.src.rpm src upload_file $RPM_PROJECT-run-$v.$RPM_ARCH.rpm $RPM_ARCH diff --git a/scripts/upload.sh b/scripts/upload.sh index 001768fc..ed52d9d2 100644 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -30,7 +30,7 @@ MYNAME=`basename $0` -HOST=ftp.jannet.de +HOST=pkg.janware.com CFG_FILE=$HOME/.uploadrc login=`whoami`