diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-11-28 12:23:57 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2013-11-28 07:31:12 +0100 |
| commit | 609fee613531c834d254d1128fec483c91660fab (patch) | |
| tree | ce7f559d8b002e328803d4b1ccbe53c78b646509 /ctdb | |
| parent | 92489bfed4e6350b6858d5e39d538f41768912ae (diff) | |
| download | samba-609fee613531c834d254d1128fec483c91660fab.tar.gz samba-609fee613531c834d254d1128fec483c91660fab.tar.xz samba-609fee613531c834d254d1128fec483c91660fab.zip | |
ctdb:build: Update mkversion.sh to use samba-* tags
To test CTDB on a cluster we need to be able to build test RPMs with
relatively sane version numbers. This is a minimal change to allow
that to happen, until CTDB is integrated into the Samba build system.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/packaging/mkversion.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/packaging/mkversion.sh b/ctdb/packaging/mkversion.sh index 7a550a54f42..bc50165f982 100755 --- a/ctdb/packaging/mkversion.sh +++ b/ctdb/packaging/mkversion.sh @@ -34,10 +34,10 @@ fi # # If we're not directly on a tag, this is a devel release; we append # .0.<patchnum>.<checksum>.devel to the release. -TAG=`git describe` +TAG=`git describe --match "samba-*"` case "$TAG" in - ctdb-*) - TAG=${TAG##ctdb-} + samba-*) + TAG=${TAG##samba-} case "$TAG" in *-*-g*) # 0.9-168-ge6cf0e8 # Not exactly on tag: devel version. |