From 2c213707465e8e904064f97ead08a23ed51b79b9 Mon Sep 17 00:00:00 2001 From: Turbo Fredriksson Date: Tue, 23 Apr 2013 15:35:37 -0700 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 zfsonlinux/zfs#1402 --- config/spl-meta.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/spl-meta.m4 b/config/spl-meta.m4 index ccda74d87..a51fa797e 100644 --- a/config/spl-meta.m4 +++ b/config/spl-meta.m4 @@ -56,7 +56,7 @@ AC_DEFUN([SPL_AC_META], [ fi SPL_META_RELEASE=_SPL_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="${SPL_META_NAME}-${SPL_META_VERSION}*" _alias=$(git describe --match=${_match} 2>/dev/null) _release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')