diff options
| author | Turbo Fredriksson <[email protected]> | 2013-04-20 07:24:15 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-04-24 16:18:49 -0700 |
| commit | d012ba3832e11511451ff71c1c45f4f64c3b759c (patch) | |
| tree | 2d58b7b44358aac2dfaf5c2002fca4efce2214fd | |
| parent | 382c4e5184c9caa25e85f277564657243db2a150 (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 #1402
| -rw-r--r-- | config/zfs-meta.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4 index 03a15db36..20a61cf04 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') |