From d6455db57de6d2d47a50adfa974d5935ccc22c45 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 4 Oct 2016 17:05:50 -0400 Subject: [PATCH] ceph-setup: when in cmake use different flags for compression Signed-off-by: Alfredo Deza --- ceph-setup/build/build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 -- 2.47.3