From 79aada6105f3aa3698df28cc10fe30a51c5b47aa Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 29 May 2014 15:03:43 -0700 Subject: [PATCH] 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 --- config/zfs-meta.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4 index 20a61cf04d..7c92dd541e 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