diff options
| author | Brian Behlendorf <[email protected]> | 2014-05-29 15:03:43 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-05-29 19:31:50 -0700 |
| commit | 79aada6105f3aa3698df28cc10fe30a51c5b47aa (patch) | |
| tree | 86ba3011415c2acce69fdbe4a03c94b1c230449f /config | |
| parent | 6795a698f4ec2f49abef843d5de8f7b55abdfffe (diff) | |
Restrict release number to META version
When creating packages in a git repository the release number
can be automatically set by 'git describe'. This normally works
well but if your repository has newer tags which match the form
NAME-VERSION* the release may be incorrectly calculated. To
prevent this the match patten has been restricted to the contents
of the META file, NAME-VERSION.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'config')
| -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 20a61cf04..7c92dd541 100644 --- a/config/zfs-meta.m4 +++ b/config/zfs-meta.m4 @@ -68,7 +68,7 @@ AC_DEFUN([ZFS_AC_META], [ ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([Release]); if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then - _match="${ZFS_META_NAME}-${ZFS_META_VERSION}*" + _match="${ZFS_META_NAME}-${ZFS_META_VERSION}" _alias=$(git describe --match=${_match} 2>/dev/null) _release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g') if test -n "${_release}"; then |