rpmdist.mk: Incorporate distribution into rpm release platform-map file

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-13 15:15:23 +00:00
commit 3c3b6a4781

View file

@ -24,7 +24,8 @@ FTP_HOST_LOGIN ?= root
RPM_PROJECT ?= $(PROJECT) RPM_PROJECT ?= $(PROJECT)
RPM_VERSION ?= $(DIST_VERSION) RPM_VERSION ?= $(DIST_VERSION)
LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX) LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
LAST_RPM_VERSION ?= $(shell sh $(MOD_SCRIPT_DIR)/platform-map-file.sh -p $RPM_ARCH $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//' LAST_RPM_VERSION ?= $(shell sh $(MOD_SCRIPT_DIR)/platform-map-file.sh \
-p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//'
RPMBUILD ?= rpmbuild RPMBUILD ?= rpmbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) | \ HASH = $(shell $(cvs_files) | \