2
0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00

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 <xemul@virtuozzo.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov 2016-03-08 12:28:00 +03:00 committed by Pavel Emelyanov
parent fc2c3c94b8
commit d55a1fdd31

View File

@ -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