From d012ba3832e11511451ff71c1c45f4f64c3b759c Mon Sep 17 00:00:00 2001 From: Turbo Fredriksson Date: Sat, 20 Apr 2013 07:24:15 +0200 Subject: [PATCH] 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 Issue #1402 --- config/zfs-meta.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4 index 03a15db..20a61cf 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') -- 1.8.3.1