X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-cli.git;a=blobdiff_plain;f=Makefile;h=0e377e1daea6f877f9acf9055243280005019b8b;hp=65dc031380c05bc79f832f501d1d0d233dd91c3a;hb=5b9b7280b3b812f596de2cbdebce5c5877c7f50e;hpb=aabf2c598db74783e62e81e4ca008ce47fe130ba 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: _-..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