]> granicus.if.org Git - zfs/commit
Fix automatically generated release number
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 21 Sep 2016 20:44:32 +0000 (13:44 -0700)
committerGitHub <noreply@github.com>
Wed, 21 Sep 2016 20:44:32 +0000 (13:44 -0700)
commit8acfb2bcc118555fed2c0902c33d300a57630368
tree1e5b04fe91bc600ed018f29311bf332559b0cf81
parentcb81c0c5887ffd6d862b13bca594d522e3f8673c
Fix automatically generated release number

When building from the head of a branch a release number is
automatically generated with `git describe` using the last tag
on that branch as the base.  For this to work the last tag on the
branch needs to be predictable given the current META file.

This logic was accidentally broken when an -rcX tag was added to
the branch.  Update it to search for a VERSION or VERSION-RELEASE
tag.

Reviewed-by: Chris Siebenmann <cks.git01@cs.toronto.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue zfsonlinux/zfs#5105
Closes #572
config/spl-meta.m4