From 8f454ab11d3c0e9b6a40e125230539420dbbeb8b Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 5 Jul 2018 10:24:49 +0200 Subject: Update/fix rpm and deb packaging - fix packaging to be compliant with latest subprojects hierarchy (Master, Master-Next, ElectricEel, ...) - fix rpmlint warnings/error Change-Id: Ib8c2014624542d3dfb81818ed605dc7a2dedf2c5 Signed-off-by: Sebastien Douheret --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 271061c..3877ab7 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,10 @@ endif ifeq ($(SUB_VERSION), ) PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip else - PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip + # only use dot as separator to allow rpm packaging (see version .spec file) + PK_VER := $(subst _,.,$(subst -,,$(VERSION))) + PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION))) + PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip endif -- cgit 1.2.3-korg