From 3c3b6a4781a74a780a0732471262fdaa47d7610c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 13 Jun 2014 15:15:23 +0000 Subject: [PATCH] rpmdist.mk: Incorporate distribution into rpm release platform-map file Signed-off-by: Jan Lindemann --- make/rpmdist.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index d55f3162..3d469019 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -24,7 +24,8 @@ FTP_HOST_LOGIN ?= root RPM_PROJECT ?= $(PROJECT) RPM_VERSION ?= $(DIST_VERSION) 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 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true HASH = $(shell $(cvs_files) | \