Fix build version from tag

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Makefile

@@ -112,10 +112,6 @@ ifeq ($(PATCH),)
 $(error Invalid patch version)
 endif
 
-ifneq ($(VERSION_STRING),$(VERSION)$(if $(TAG),-$(TAG),))
-$(error Version not updated correctly: $(VERSION_STRING) != $(VERSION)$(if $(TAG),-$(TAG),))
-endif
-
 $(SRCS_DIR)/nvc.h: $(SRCS_DIR)/nvc.h.template
 	cat $< | \
 	sed -e 's/{{NVC_MAJOR}}/$(MAJOR)/g' | \
@@ -343,7 +339,7 @@ deb: prefix:=/usr
 deb: libdir:=/usr/lib/@DEB_HOST_MULTIARCH@
 
 
-PKG_VERS := $(VERSION)$(if $(TAG),~$(TAG),)
+PKG_VERS := $(VERSION_STRING)
 PKG_REV := 1
 deb: install
 	$(CP) -T $(PKG_DIR)/deb $(DESTDIR)/debian

mk/Dockerfile.amazonlinux

@@ -57,6 +57,8 @@ ARG LIB_VERSION
 ENV LIB_VERSION=${LIB_VERSION}
 ARG LIB_TAG
 ENV LIB_TAG=${LIB_TAG}
+ARG LIB_BUILD
+ENV LIB_BUILD=${LIB_BUILD}
 
 RUN make distclean && make -j"$(nproc)"
 

mk/Dockerfile.centos

@@ -62,6 +62,8 @@ ARG LIB_VERSION
 ENV LIB_VERSION=${LIB_VERSION}
 ARG LIB_TAG
 ENV LIB_TAG=${LIB_TAG}
+ARG LIB_BUILD
+ENV LIB_BUILD=${LIB_BUILD}
 
 RUN make distclean && make -j"$(nproc)"
 

mk/Dockerfile.debian

@@ -55,6 +55,8 @@ ARG LIB_VERSION
 ENV LIB_VERSION=${LIB_VERSION}
 ARG LIB_TAG
 ENV LIB_TAG=${LIB_TAG}
+ARG LIB_BUILD
+ENV LIB_BUILD=${LIB_BUILD}
 
 RUN make distclean && make -j"$(nproc)"
 

mk/Dockerfile.opensuse-leap

@@ -50,6 +50,8 @@ ARG LIB_VERSION
 ENV LIB_VERSION=${LIB_VERSION}
 ARG LIB_TAG
 ENV LIB_TAG=${LIB_TAG}
+ARG LIB_BUILD
+ENV LIB_BUILD=${LIB_BUILD}
 
 # META_NOECHO=echo is required to work around a bug in Leap 15's version of bmake,
 # see also https://github.com/ptt/pttbbs/issues/30

mk/Dockerfile.ubuntu

@@ -54,6 +54,8 @@ ARG LIB_VERSION
 ENV LIB_VERSION=${LIB_VERSION}
 ARG LIB_TAG
 ENV LIB_TAG=${LIB_TAG}
+ARG LIB_BUILD
+ENV LIB_BUILD=${LIB_BUILD}
 
 RUN make distclean && make -j"$(nproc)"
 

mk/docker.mk

@@ -166,6 +166,7 @@ docker-build-%: $(ARTIFACTS_DIR)
 	    --build-arg REVISION="$(REVISION)" \
 	    --build-arg LIB_VERSION="$(LIB_VERSION)" \
 	    --build-arg LIB_TAG="$(LIB_TAG)" \
+	    --build-arg LIB_BUILD="$(LIB_BUILD)" \
 	    $(EXTRA_BUILD_ARGS) \
 	    --tag $(BUILDIMAGE) \
 	    --file $(DOCKERFILE) .

versions.mk

@@ -16,8 +16,27 @@ GIT_TAG ?= $(patsubst v%,%,$(shell git describe --tags 2>/dev/null))
 GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
 
 LIB_NAME := libnvidia-container
-LIB_VERSION ?= $(word 1,$(subst -, ,$(GIT_TAG)))
-LIB_TAG ?= $(subst -,+,$(patsubst $(LIB_VERSION)-%,%,$(GIT_TAG)))
+
+PARTS := $(subst -, ,$(GIT_TAG))
+build_start = 2
+build_end = $(words $(PARTS))
+ifeq ($(LIB_VERSION),)
+# If LIB_VERSION is not already set we infer all versions from the git tag
+auto_version = yes
+LIB_VERSION ?= $(word 1,$(PARTS))
+ifeq ($(LIB_TAG),)
+ifneq ($(patsubst rc.%,%,$(word 2,$(PARTS))),$(word 2,$(PARTS)))
+LIB_TAG = $(word 2,$(PARTS))
+build_start = 3
+endif
+endif
+endif
+
+ifeq ($(auto_version),yes)
+empty :=
+space := $(empty) $(empty)
+LIB_BUILD ?= $(subst $(space),.,$(strip $(wordlist $(build_start),$(build_end),$(PARTS))))
+endif
 
 VERSION_PARTS := $(subst ., ,$(LIB_VERSION))
 MAJOR := $(word 1,$(VERSION_PARTS))
@@ -26,4 +45,5 @@ PATCH := $(word 3,$(VERSION_PARTS))
 
 VERSION := $(LIB_VERSION)
 TAG := $(LIB_TAG)
-VERSION_STRING := $(LIB_VERSION)$(if $(TAG),-$(TAG),)
+BUILD := $(LIB_BUILD)
+VERSION_STRING := $(LIB_VERSION)$(if $(TAG),-$(TAG),)$(if $(BUILD),+$(BUILD),)