]> granicus.if.org Git - spl/commitdiff
Support .nogitrelease file
authorTurbo Fredriksson <turbo@bayour.com>
Tue, 23 Apr 2013 22:35:37 +0000 (15:35 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 24 Apr 2013 23:18:03 +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 zfsonlinux/zfs#1402

config/spl-meta.m4

index ccda74d870dd78732fa0797675dc89eca6e413df..a51fa797eefb7f89e9eb0478dbfde37313f0a23a 100644 (file)
@@ -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')