summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-05 10:24:49 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-05 10:44:43 +0200
commit8f454ab11d3c0e9b6a40e125230539420dbbeb8b (patch)
tree907dc272ea392d5b10ace89efe8f6c7f7cd30001 /Makefile
parent91e5a1a769d4d5194cd6251e21bfb607b94f0c56 (diff)
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 <sebastien.douheret@iot.bzh>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
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