diff options
| author | Turbo Fredriksson <[email protected]> | 2013-04-23 15:35:37 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-04-24 16:18:03 -0700 |
| commit | 2c213707465e8e904064f97ead08a23ed51b79b9 (patch) | |
| tree | 8dea42abd9c116c8dabe12f18e905d4fea7601ea | |
| parent | c1b20ce32084fa946f446400a66c4b606d7649d7 (diff) | |
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 <[email protected]>
Issue zfsonlinux/zfs#1402
| -rw-r--r-- | config/spl-meta.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
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') |