From: Turbo Fredriksson <turbo@bayour.com>
Date: Sat, 20 Apr 2013 05:24:15 +0000 (+0200)
Subject: Support .nogitrelease file
X-Git-Tag: zfs-0.6.2~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d012ba3832e11511451ff71c1c45f4f64c3b759c;p=zfs

Support .nogitrelease file

When building a custom release in a git tree provide the ability
to prevent the release field from being overwritten by the
`git describe` output.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1402
---

diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
index 03a15db36..20a61cf04 100644
--- a/config/zfs-meta.m4
+++ b/config/zfs-meta.m4
@@ -67,7 +67,7 @@ AC_DEFUN([ZFS_AC_META], [
 		fi
 
 		ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([Release]);
-		if git rev-parse --git-dir > /dev/null 2>&1; then
+		if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
 			_match="${ZFS_META_NAME}-${ZFS_META_VERSION}*"
 			_alias=$(git describe --match=${_match} 2>/dev/null)
 			_release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')