diff options
| author | Jorgen Lundman <lundman@lundman.net> | 2021-09-02 13:51:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 13:51:29 +0000 |
| commit | 157a4d05bd732bdeb6f23158331dd683d89305cb (patch) | |
| tree | 7836dd03320de1f13e39848459583a52aa20632f | |
| parent | c27c124a88b2a42e0d7b3bedd12197608122702b (diff) | |
| download | src-157a4d05bd732bdeb6f23158331dd683d89305cb.tar.gz src-157a4d05bd732bdeb6f23158331dd683d89305cb.zip | |
autoconf: allow Release to contain hyphen
To avoid clashing with tags and releases, we'll use "zfs-macOS".
Meta: 1
Name: zfs-macOS
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Jorgen Lundman <lundman@lundman.net>
Closes #12437
| -rw-r--r-- | config/zfs-meta.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4 index b3c1befaac5d..1c9d246124d1 100644 --- a/config/zfs-meta.m4 +++ b/config/zfs-meta.m4 @@ -73,14 +73,14 @@ AC_DEFUN([ZFS_AC_META], [ 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') + _release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|sed 's/-/_/g') if test -n "${_release}"; then ZFS_META_RELEASE=${_release} _zfs_ac_meta_type="git describe" else _match="${ZFS_META_NAME}-${ZFS_META_VERSION}-${ZFS_META_RELEASE}" _alias=$(git describe --match=${_match} 2>/dev/null) - _release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g') + _release=$(echo ${_alias}|sed 's/${ZFS_META_NAME}//'|cut -f3- -d'-'|sed 's/-/_/g') if test -n "${_release}"; then ZFS_META_RELEASE=${_release} _zfs_ac_meta_type="git describe" |