janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-16 20:40:47 +01:00
Code Activity

$(TOPDIR), make, scripts: Ftp.jannet.de / ftp.janware.com -> pkg.janware.com

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-16 16:11:11 +00:00
commit f4efde3377
11 changed files with 61 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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)

7
make/rpmdist.mk
View file

@ -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)

6
make/smart-selection.mk
View file

@ -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; \

4
make/suse-selection.mk
View file

@ -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 $@

2
make/upload-defs-rpm.mk
View file

@ -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/-.*//')