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

upload-defs-rpm.mk: Weed out outdated stuff

Browse source 
Move the necessary definitions into rpmdist.mk and disable the rest
in upload-defs-rpm.mk. Can be removed as soon as the stuff is tested
to work well.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-12-03 12:51:03 +00:00
commit f3caef9690
2 changed files with 43 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/rpmdist.mk
View file

@ -73,6 +73,13 @@ RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires devel $(PROJECT))
RPM_REQUIRES_RUN += $(call proj_query, pkg-requires run $(PROJECT))
RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = __NEXT_VERSION__
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)/inst-source
RPM_UPLOAD_USER ?= $(shell id -un)
RPM_UPLOAD_GROUP ?= $(shell id -ug)
RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP)
unexport RPM_VERSION VERSION DIST_SRC_DIR
include $(MODDIR)/make/tag-rules.mk
@ -81,7 +88,8 @@ include $(MODDIR)/make/upload-rules.mk
PKG_SH = $(PKG_SH_EXE) \
-N $(RPM_PROJECT) \
-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \
-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT)
-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \
-B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB)
# -t $(DIST_SRC_DIR) # wrong: contains $(RPM_PROJECT)-$(RPM_VERSION) but is expected differently