Support .nogitrelease file
authorTurbo Fredriksson <turbo@bayour.com>
Sat, 20 Apr 2013 05:24:15 +0000 (07:24 +0200)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 24 Apr 2013 23:18:49 +0000 (16:18 -0700)
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

config/zfs-meta.m4

index 03a15db..20a61cf 100644 (file)
@@ -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')