From 3ea101b5f8da17c9f68f891608c346c3faf07f58 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sun, 14 Apr 2019 07:14:14 -0400 Subject: [PATCH] New release (1:12.2.12-1) Signed-off-by: Kaleb S. KEITHLEY --- 0001-blobstore.patch | 51 ------------------------------- 0008-src-rgw-CMakeLists.txt.patch | 24 --------------- ceph.spec | 10 +++--- sources | 2 +- 4 files changed, 7 insertions(+), 80 deletions(-) delete mode 100644 0001-blobstore.patch delete mode 100644 0008-src-rgw-CMakeLists.txt.patch diff --git a/0001-blobstore.patch b/0001-blobstore.patch deleted file mode 100644 index eb32e19..0000000 --- a/0001-blobstore.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- ceph-13.2.1/src/spdk/lib/blob/blobstore.c.orig 2018-07-30 08:31:05.138254900 -0400 -+++ ceph-13.2.1/src/spdk/lib/blob/blobstore.c 2018-07-30 08:32:05.314254900 -0400 -@@ -393,7 +393,7 @@ - * happen for example if a bogus blobid is passed in through open. - */ - if (blob->id != pages[0].id) { -- SPDK_ERRLOG("Blobid (%lu) doesn't match what's in metadata (%lu)\n", -+ SPDK_ERRLOG("Blobid (%llu) doesn't match what's in metadata (%llu)\n", - blob->id, pages[0].id); - return -ENOENT; - } -@@ -2947,7 +2947,7 @@ - - /* START spdk_blob_resize */ - int --spdk_blob_resize(struct spdk_blob *_blob, uint64_t sz) -+spdk_blob_resize(struct spdk_blob *_blob, size_t sz) - { - struct spdk_blob_data *blob = __blob_to_data(_blob); - int rc; ---- ceph-13.2.1/src/spdk/lib/lvol/lvol.c.orig 2018-07-30 09:08:38.137254900 -0400 -+++ ceph-13.2.1/src/spdk/lib/lvol/lvol.c 2018-07-30 09:10:09.642254900 -0400 -@@ -970,7 +970,7 @@ - num_clusters = divide_round_up(sz, spdk_bs_get_cluster_size(bs)); - free_clusters = spdk_bs_free_cluster_count(bs); - if (num_clusters > free_clusters) { -- SPDK_ERRLOG("Not enough free clusters left (%zu) on lvol store to add lvol %zu clusters\n", -+ SPDK_ERRLOG("Not enough free clusters left (%llu) on lvol store to add lvol %llu clusters\n", - free_clusters, num_clusters); - return -ENOMEM; - } -@@ -1026,7 +1026,7 @@ - if (new_clusters > used_clusters) { - /* Check if there is enough clusters left to resize */ - if (new_clusters - used_clusters > free_clusters) { -- SPDK_ERRLOG("Not enough free clusters left on lvol store to resize lvol to %zu clusters\n", sz); -+ SPDK_ERRLOG("Not enough free clusters left on lvol store to resize lvol to %llu clusters\n", sz); - return -ENOMEM; - } - } ---- ceph-13.2.1/src/spdk/lib/event/reactor.c.orig 2018-07-30 09:44:01.514254900 -0400 -+++ ceph-13.2.1/src/spdk/lib/event/reactor.c 2018-07-30 09:45:02.291254900 -0400 -@@ -651,7 +651,7 @@ - char mempool_name[32]; - - socket_mask = spdk_reactor_get_socket_mask(); -- SPDK_NOTICELOG("Occupied cpu socket mask is 0x%lx\n", socket_mask); -+ SPDK_NOTICELOG("Occupied cpu socket mask is 0x%" PRIx64 "\n", socket_mask); - - for (i = 0; i < SPDK_MAX_SOCKET; i++) { - if ((1ULL << i) & socket_mask) { diff --git a/0008-src-rgw-CMakeLists.txt.patch b/0008-src-rgw-CMakeLists.txt.patch deleted file mode 100644 index 9f6cebc..0000000 --- a/0008-src-rgw-CMakeLists.txt.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ceph-12.2.11/src/rgw/CMakeLists.txt.orig 2019-01-30 10:51:26.000000000 -0500 -+++ ceph-12.2.11/src/rgw/CMakeLists.txt 2019-02-11 06:02:06.748608099 -0500 -@@ -177,9 +177,7 @@ - - add_library(radosgw_a STATIC ${radosgw_srcs} - $) --if (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL) -- target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES}) --endif() -+target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES}) - - add_executable(radosgw rgw_main.cc) - target_link_libraries(radosgw radosgw_a librados -@@ -195,10 +193,6 @@ - cls_version cls_replica_log cls_user) - install(TARGETS radosgw DESTINATION bin) - --if (WITH_RADOSGW_BEAST_FRONTEND) -- target_link_libraries(radosgw_a ${OPENSSL_LIBRARIES}) --endif() -- - set(radosgw_admin_srcs - rgw_admin.cc - rgw_orphan.cc) diff --git a/ceph.spec b/ceph.spec index 83c20d3..d7704e7 100644 --- a/ceph.spec +++ b/ceph.spec @@ -85,7 +85,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.2.11 +Version: 12.2.12 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -108,7 +108,6 @@ Patch002: 0002-cmake-Support-ppc64.patch Patch003: 0003-librbd-Conditionally-import-TrimRequest.cc.patch Patch005: 0005-src-rocksdb-table-block.h.patch Patch007: 0007-src-osd-PrimaryLogPG.cc.patch -Patch008: 0008-src-rgw-CMakeLists.txt.patch %if 0%{?suse_version} %if 0%{?is_opensuse} ExclusiveArch: x86_64 aarch64 ppc64 ppc64le @@ -414,7 +413,7 @@ Summary: Ceph daemon for mirroring RBD images %if 0%{?suse_version} Group: System/Filesystems %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n rbd-mirror Daemon for mirroring RBD images between Ceph clusters, streaming @@ -435,7 +434,7 @@ Summary: Rados REST gateway %if 0%{?suse_version} Group: System/Filesystems %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif @@ -1806,6 +1805,9 @@ exit 0 %changelog +* Fri Apr 12 2019 Kaleb S. KEITHLEY - 1:12.2.12-1 +- New release (1:12.2.12-1) + * Fri Feb 1 2019 Kaleb S. KEITHLEY - 1:12.2.11-1 - New release (1:12.2.11-1) diff --git a/sources b/sources index 11b5dc0..3b85211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ceph-12.2.11.tar.gz) = 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef +SHA512 (ceph-12.2.12.tar.gz) = e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc