X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=a91af3f707905f94efb3de8881ea44636ac3ed93;hb=7b929ebc73b75f080066bef555e95b5a81c5a2ab;hp=f0ae0b31cefb93eaccc9d23ca74f35713800d8e9;hpb=777f88336442c887552fb3353db93a5ed5b4ff74;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index f0ae0b3..a91af3f 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ SYNCTHING_INOTIFY_VERSION = 0.8.7
 
 
 # Retrieve git tag/commit to set version & sub-version strings
-GIT_DESC := $(shell git describe --always --tags)
+GIT_DESC := $(shell git describe --always --tags --match "[0-9]*")
 VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
 ifeq (-,$(findstring -,$(GIT_DESC)))
 	SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
@@ -100,16 +100,15 @@ else
 	WEBAPP_BUILD_RULE=build:prod
 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: tools/syncthing build
 
 .PHONY: build