janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 21:57:38 +01:00
Code Activity

$(MODDIR)/make/defs.mk: Replace variable OS with OS_NAME_VERSION

Browse source 
OS_NAME_VERSION is less ambiguous.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-02-27 10:22:27 +00:00
commit b37359a725
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/rpmdist.mk
View file

@ -23,13 +23,13 @@ FTP_DIR_MODE ?= 755
FTP_HOST_LOGIN ?= root
RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
RELEASES ?= $(shell $(PKG_SH_EXE) version \
-p $(OS)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
-p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) -z | \
grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS)
LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS_NAME_VERSION)
include $(MODDIR)/make/tag-defs.mk
@ -89,8 +89,8 @@ RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-versi
RPM_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT))
RPM_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT))
RPM_UPLOAD_OS_NAME = $(shell echo $(OS) | sed 's/-.*//')
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//')
RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
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)