From: Sage Weil <sage@redhat.com>
Date: Tue, 21 Jun 2016 17:19:49 +0000 (-0400)
Subject: build_snapshot_native.sh: use make-dist
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F412%2Fhead;p=ceph-build.git

build_snapshot_native.sh: use make-dist

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/build_snapshot_native.sh b/build_snapshot_native.sh
index 35f7f2c4..20264310 100755
--- a/build_snapshot_native.sh
+++ b/build_snapshot_native.sh
@@ -22,18 +22,28 @@ numproc=`cat /proc/cpuinfo |grep -c processor`
 cephver=`git describe | cut -c 2-`
 echo current version $cephver
 
-rm ceph-*.tar.gz || true
-make dist
-
-tarver=`ls ceph-*.tar.gz | cut -c 6- | sed 's/.tar.gz//'`
-echo tarball vers $tarver
-
-echo extracting
-mkdir -p $outdir
-cd $outdir
+rm ceph-*.tar.* || true
+
+if [ -x make-dist ]; then
+    ./make-dist
+    test -e ceph-$cephver.tar.bz2  # our $cephver should match make-dist's
+    mkdir -p $outdir
+    cd $outdir
+    tar jxf $srcdir/ceph-$cephver.tar.bz2
+else
+    make dist
+
+    tarver=`ls ceph-*.tar.gz | cut -c 6- | sed 's/.tar.gz//'`
+    echo tarball vers $tarver
+
+    echo extracting
+    mkdir -p $outdir
+    cd $outdir
+
+    tar zxf $srcdir/ceph-$tarver.tar.gz
+    [ "$tarver" != "$cephver" ] && mv ceph-$tarver ceph-$cephver
+fi
 
-tar zxf $srcdir/ceph-$tarver.tar.gz 
-[ "$tarver" != "$cephver" ] && mv ceph-$tarver ceph-$cephver
 
 cd ceph-$cephver
 cp -av $srcdir/debian debian