From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 4 Oct 2016 21:05:50 +0000 (-0400)
Subject: ceph-setup: when in cmake use different flags for compression
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6455db57de6d2d47a50adfa974d5935ccc22c45;p=ceph-build.git

ceph-setup: when in cmake use different flags for compression

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index 2eb299cd..ad4a813e 100644
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -135,7 +135,8 @@ else
     cp rpm/*.patch $releasedir/$cephver/rpm || true
     cd $releasedir/$cephver
 
-    tar zxf $srcdir/ceph-$vers.tar.gz
+    tar $extract_flags $srcdir/ceph-$vers.$extension
+
     [ "$vers" != "$cephver" ] && mv ceph-$vers ceph-$cephver
 
     tar zcf ceph_$cephver.orig.tar.gz ceph-$cephver
@@ -143,12 +144,13 @@ else
 
     tar jcf ceph-$cephver.tar.bz2 ceph-$cephver
 
-    # copy debian dir, too
-    cp -a $srcdir/debian debian
+    # copy debian dir, too. Prevent errors with `true` when using cmake
+    cp -a $srcdir/debian debian || true
     cd $srcdir
 
-    # copy in spec file, too
-    cp ceph.spec $releasedir/$cephver
+    # copy in spec file, too. If using cmake, the spec file
+    # will already exist.
+    cp ceph.spec $releasedir/$cephver || true
 fi
 
 if [ -n "$versionfile" ]; then