branto pushed to ceph (f22). "Fix arm linking issue (..more)"

[notifications at fedoraproject.org]

From af0a1d434bb169ef6e3e5df27d6e83d6bbb3ad0a Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto at redhat.com>
Date: Mon, 18 May 2015 20:34:11 +0200
Subject: Fix arm linking issue

Resolves: rhbz#1222286

diff --git a/0003-Skip-initialization-if-rtdsc-is-not-implemented.patch b/0003-Skip-initialization-if-rtdsc-is-not-implemented.patch
new file mode 100644
index 0000000..3abc744
--- /dev/null
+++ b/0003-Skip-initialization-if-rtdsc-is-not-implemented.patch
@@ -0,0 +1,33 @@
+From fdd728c0872b34d1b6f96ee5601b619748afc9e8 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto at redhat.com>
+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 5c2b979..a2f6532 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -12,7 +12,7 @@
 #################################################################################
 Name:		ceph
 Version:	0.94.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
 License:	GPLv2
@@ -24,6 +24,7 @@ Patch0:		init-ceph.in-fedora.patch
 %endif
 Patch1:		0001-Disable-erasure_codelib-neon-build.patch
 Patch2:		0002-Add-support-for-PPC-arch.patch
+Patch3:		0003-Skip-initialization-if-rtdsc-is-not-implemented.patch
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
@@ -430,6 +431,7 @@ python-cephfs instead.
 %endif
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # Find jni.h
@@ -928,6 +930,9 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 # actually build this meta package.
 
 %changelog
+* Mon May 18 2015 Boris Ranto <branto at redhat.com> - 1:0.94.1-2
+- Fix arm linking issue (rhbz#1222286)
+
 * Tue Apr 14 2015 Boris Ranto <branto at redhat.com> - 1:0.94.1-1
 - Rebase to latest upstream version and sync-up the spec file
 - Add arm compilation patches
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ceph.git/commit/?h=f22&id=af0a1d434bb169ef6e3e5df27d6e83d6bbb3ad0a