From d55a1fdd31d16aa6a4215042590b53067bcdb42a Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Tue, 8 Mar 2016 12:28:00 +0300 Subject: [PATCH] make: Improve tar generation By default it generates archive name same as a tag name, but Pavel requested to match old scheme and strip off "v" prefix. Reported-by: Pavel Emelyanov Signed-off-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 756938720..ce9e40b15 100644 --- a/Makefile +++ b/Makefile @@ -165,12 +165,17 @@ test: zdtm $(Q) MAKEFLAGS= $(MAKE) -C test PHONY += test -tar-name := $(shell git tag -l v$(CRIU_VERSION)) -ifeq ($(tar-name),) - tar-name := $(shell git describe) +# +# Generating tar requires tag matched CRIU_VERSION. +# If not found then simply use GIT's describe with +# "v" prefix stripped. +head-name := $(shell git tag -l v$(CRIU_VERSION)) +ifeq ($(head-name),) + head-name := $(shell git describe) endif +tar-name := $(shell echo $(head-name) | sed -e 's/^v//g') criu-$(tar-name).tar.bz2: - git archive --format tar --prefix 'criu-$(tar-name)/' $(tar-name) | bzip2 > $@ + git archive --format tar --prefix 'criu-$(tar-name)/' $(head-name) | bzip2 > $@ dist tar: criu-$(tar-name).tar.bz2 @true .PHONY: dist tar