diff --git a/0003-Skip-initialization-if-rtdsc-is-not-implemented.patch b/0003-Skip-initialization-if-rtdsc-is-not-implemented.patch deleted file mode 100644 index 3abc744..0000000 --- a/0003-Skip-initialization-if-rtdsc-is-not-implemented.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fdd728c0872b34d1b6f96ee5601b619748afc9e8 Mon Sep 17 00:00:00 2001 -From: Boris Ranto -Date: Mon, 18 May 2015 20:27:56 +0200 -Subject: [PATCH] Skip initialization if rtdsc is not implemented - -Patch by James Page. See - -https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1432786 - -for more details. ---- - src/common/Cycles.cc | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/common/Cycles.cc b/src/common/Cycles.cc -index a2efcf3..a5367f7 100644 ---- a/src/common/Cycles.cc -+++ b/src/common/Cycles.cc -@@ -52,6 +52,11 @@ void Cycles::init() - if (cycles_per_sec != 0) - return; - -+ -+ // Skip initialization if rtdsc is not implemented -+ if (rdtsc() == 0) -+ return; -+ - // Compute the frequency of the fine-grained CPU timer: to do this, - // take parallel time readings using both rdtsc and gettimeofday. - // After 10ms have elapsed, take the ratio between these readings. --- -2.1.0 - diff --git a/ceph.spec b/ceph.spec index 0c4ccea..b11a48e 100644 --- a/ceph.spec +++ b/ceph.spec @@ -11,8 +11,8 @@ # common ################################################################################# Name: ceph -Version: 0.94.3 -Release: 2%{?dist} +Version: 0.94.4 +Release: 1%{?dist} Epoch: 1 Summary: User space components of the Ceph file system License: GPLv2 @@ -23,7 +23,6 @@ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 Patch0: init-ceph.in-fedora.patch %endif Patch1: 0001-Disable-erasure_codelib-neon-build.patch -Patch3: 0003-Skip-initialization-if-rtdsc-is-not-implemented.patch # fix build without tcmalloc # https://github.com/ceph/rocksdb/pull/5 Patch10: ceph-0.94.1-tcmalloc.patch @@ -430,7 +429,6 @@ python-cephfs instead. %patch0 -p1 -b .init %endif %patch1 -p1 -%patch3 -p1 %patch10 -p1 -b .tcmalloc %build @@ -935,6 +933,10 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 # actually build this meta package. %changelog +* Tue Oct 20 2015 Boris Ranto - 1:0.94.4-1 +- Rebase to latest upstream version +- The rtdsc patch got merged upstream and is already present in the release + * Thu Aug 27 2015 Jonathan Wakely - 1:0.94.3-2 - Rebuilt for Boost 1.59 diff --git a/sources b/sources index 46a8cd6..5443bf2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ccbaba6cad56cf71719661a0cdcc6ad6 ceph-0.94.3.tar.bz2 +d7b42d06e8eaa7820fe34490aaaba101 ceph-0.94.4.tar.bz2