release_tarball: use make-dist if available

this enables us to prepare release tarball for versions without
autotools support, where we use make-dist to create the release tarball
instead.

- make-dist only produces .bz2 tarball, so we switch to .bz2 in this
  change.
- it's a waste to create both .gz and .bz2 tarballs using "make dist*",
  as we only use one of the to repackage the .gz and .bz2 tarballs.
  so let's drop "make dist" and use "make dist-bzip2" only.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/release_tarball.sh b/release_tarball.sh
index 497954382d2067250fbd0d3e00522bc0f87df111..77b19389ddb895bbc0b7336bc645d96dce64929f 100755 (executable)
--- a/release_tarball.sh
+++ b/release_tarball.sh
@@ -35,10 +35,14 @@ else
     echo building tarball
     rm ceph-*.tar.gz || true
     rm ceph-*.tar.bz2 || true
-    make dist
-    make dist-bzip2
 
-    vers=`ls ceph-*.tar.gz | cut -c 6- | sed 's/.tar.gz//'`
+    if [ -x make-dist ]; then
+        ./make-dist
+    else
+        make dist-bzip2
+    fi
+
+    vers=`ls ceph-*.tar.bz2 | cut -c 6- | sed 's/.tar.bz2//'`
     echo tarball vers $vers
 
     echo extracting
@@ -46,7 +50,7 @@ else
     cp rpm/*.patch $releasedir/$cephver/rpm || true
     cd $releasedir/$cephver
 
-    tar zxf $srcdir/ceph-$vers.tar.gz 
+    tar jxf $srcdir/ceph-$vers.tar.bz2
     [ "$vers" != "$cephver" ] && mv ceph-$vers ceph-$cephver
 
     tar zcf ceph_$cephver.orig.tar.gz ceph-$cephver