From 5b9b7280b3b812f596de2cbdebce5c5877c7f50e Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Fri, 19 Oct 2018 22:59:47 +0200
Subject: [PATCH] Rework zip package versioning

In order to always have a number that's incrementing, use git commits
number for last detected tag.

Change-Id: I9d8b6b56b9b884e4adfb20113cfe8f3738c473d6
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 65dc031..0e377e1 100644
--- a/Makefile
+++ b/Makefile
@@ -83,14 +83,13 @@ else
 	BUILD_MODE="Release mode"
 endif
 
-ifeq ($(SUB_VERSION), )
-	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
+# Build Package name (model: <target>_<arch>-<version>.<nb_commit_from_last_tag>.zip)
+ifeq (-g,$(findstring -g,$(GIT_DESC)))
+	NB_COMMIT=$(firstword $(subst -, ,$(SUB_VERSION)))
 else
-	# 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
+	NB_COMMIT=0
 endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
 .PHONY: all
 all: vendor build
-- 
2.16.6