[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/2.2/, sys-process/criu/

["Yixun Lan" <dlan@gentoo.org>]

commit:     af6724544b88a1dfbad3dcc14ca932516e299b2d
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 14:20:25 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 14:21:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af672454

sys-process/criu: fixed to not use git cmd

Gentoo-Bug: 580420

Package-Manager: portage-2.3.0_rc1

 sys-process/criu/criu-2.2.ebuild                 |  1 +
 sys-process/criu/files/2.2/criu-2.2-no-git.patch | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/sys-process/criu/criu-2.2.ebuild b/sys-process/criu/criu-2.2.ebuild
index c18ed46..a2bb1740 100644
--- a/sys-process/criu/criu-2.2.ebuild
+++ b/sys-process/criu/criu-2.2.ebuild
@@ -38,6 +38,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/${PV}/${P}-flags.patch
 	"${FILESDIR}"/${PV}/${P}-makefile.patch
+	"${FILESDIR}"/${PV}/${P}-no-git.patch
 	"${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
 	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
 )

diff --git a/sys-process/criu/files/2.2/criu-2.2-no-git.patch b/sys-process/criu/files/2.2/criu-2.2-no-git.patch
new file mode 100644
index 0000000..0622225
--- /dev/null
+++ b/sys-process/criu/files/2.2/criu-2.2-no-git.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index 7c85403..20992ed 100644
+--- a/Makefile
++++ b/Makefile
+@@ -179,9 +179,9 @@ test: zdtm
+ # 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))
++head-name := $(shell if [ -d ".git" ]; then git tag -l v$(CRIU_VERSION); fi)
+ ifeq ($(head-name),)
+-        head-name := $(shell git describe)
++        head-name := $(shell if [ -d ".git" ]; then git describe; fi)
+ endif
+ tar-name := $(shell echo $(head-name) | sed -e 's/^v//g')
+ criu-$(tar-name).tar.bz2: