From edf87a3aa789394a741f27e37d22a5c0d1c2521dee7413c1ec776c00be6c8560 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 8 Jun 2020 14:19:38 +0000 Subject: [PATCH] Accepting request 812644 from filesystems:ceph:octopus up ceph-test disk constraint OBS-URL: https://build.opensuse.org/request/show/812644 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=270 --- _constraints | 2 +- ceph-15.2.2-60-gf5864377ab.tar.bz2 | 3 --- ceph-15.2.3-252-gf2237253cd.tar.bz2 | 3 +++ ceph-test.changes | 14 ++++++++++++++ ceph-test.spec | 12 ++++++++---- ceph.changes | 14 ++++++++++++++ ceph.spec | 12 ++++++++---- 7 files changed, 48 insertions(+), 12 deletions(-) delete mode 100644 ceph-15.2.2-60-gf5864377ab.tar.bz2 create mode 100644 ceph-15.2.3-252-gf2237253cd.tar.bz2 diff --git a/_constraints b/_constraints index c90417e..b98dbb0 100644 --- a/_constraints +++ b/_constraints @@ -70,7 +70,7 @@ - 28 + 42 12 diff --git a/ceph-15.2.2-60-gf5864377ab.tar.bz2 b/ceph-15.2.2-60-gf5864377ab.tar.bz2 deleted file mode 100644 index 37b5403..0000000 --- a/ceph-15.2.2-60-gf5864377ab.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77bbceb6cf295462c110395fa4faa1a0bb4f6a8e1bca8409ff95987055789470 -size 151884521 diff --git a/ceph-15.2.3-252-gf2237253cd.tar.bz2 b/ceph-15.2.3-252-gf2237253cd.tar.bz2 new file mode 100644 index 0000000..6b337e4 --- /dev/null +++ b/ceph-15.2.3-252-gf2237253cd.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:960dc7edf7f511b9c929c1ab71068835c10d4396ea532ad66d3ba137d5dad4b6 +size 151521918 diff --git a/ceph-test.changes b/ceph-test.changes index d828b14..fb7bef6 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jun 8 14:18:25 UTC 2020 - Nathan Cutler + +- Up ceph-test disk constraint to address "no space left on device" + build error seen in OBS + +------------------------------------------------------------------- +Fri Jun 5 09:36:19 UTC 2020 - Nathan Cutler + +- Update to 15.2.3-252-gf2237253cd: + + rebase on tip of upstream "octopus" branch, SHA1 22279597fa9ca40ba2f05af9f186a99ce73a6047 + * upstream v15.2.3 release + https://ceph.io/releases/v15-2-3-octopus-released/ + ------------------------------------------------------------------- Mon May 25 12:57:39 UTC 2020 - Nathan Cutler diff --git a/ceph-test.spec b/ceph-test.spec index 6753792..0ab17f8 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -99,7 +99,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 15.2.2.60+gf5864377ab +Version: 15.2.3.252+gf2237253cd Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -115,7 +115,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD- Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-15.2.2-60-gf5864377ab.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.2.3-252-gf2237253cd.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -544,7 +544,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-15.2.2-60-gf5864377ab +%autosetup -p1 -n ceph-15.2.3-252-gf2237253cd %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -824,6 +824,7 @@ rm -rf %{buildroot}%{_tmpfilesdir}/ceph-common.conf rm -rf %{buildroot}%{_mandir}/man8/ceph-authtool.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-conf.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-dencoder.8* +rm -rf %{buildroot}%{_mandir}/man8/ceph-diff-sorted.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-rbdnamer.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-syn.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-post-file.8* @@ -836,6 +837,7 @@ rm -rf %{buildroot}%{_mandir}/man8/rbdmap.8* rm -rf %{buildroot}%{_mandir}/man8/rbd-replay.8* rm -rf %{buildroot}%{_mandir}/man8/rbd-replay-many.8* rm -rf %{buildroot}%{_mandir}/man8/rbd-replay-prep.8* +rm -rf %{buildroot}%{_mandir}/man8/rgw-orphan-list.8* rm -rf %{buildroot}%{_datadir}/ceph/known_hosts_drop.ceph.com rm -rf %{buildroot}%{_datadir}/ceph/id_rsa_drop.ceph.com rm -rf %{buildroot}%{_datadir}/ceph/id_rsa_drop.ceph.com.pub @@ -907,10 +909,12 @@ rm -rf %{buildroot}%{_unitdir}/ceph-immutable-object-cache@.service rm -rf %{buildroot}%{_unitdir}/ceph-immutable-object-cache.target rm -rf %{buildroot}%{_bindir}/rbd-nbd rm -rf %{buildroot}%{_mandir}/man8/rbd-nbd.8* +rm -rf %{buildroot}%{_bindir}/ceph-diff-sorted rm -rf %{buildroot}%{_bindir}/radosgw rm -rf %{buildroot}%{_bindir}/radosgw-token rm -rf %{buildroot}%{_bindir}/radosgw-es rm -rf %{buildroot}%{_bindir}/radosgw-object-expirer +rm -rf %{buildroot}%{_bindir}/rgw-orphan-list rm -rf %{buildroot}%{_libdir}/libradosgw.so* rm -rf %{buildroot}%{_mandir}/man8/radosgw.8* rm -rf %{buildroot}%{_unitdir}/ceph-radosgw@.service @@ -982,7 +986,7 @@ rm -rf %{buildroot}%{python3_sitearch}/rbd.cpython*.so rm -rf %{buildroot}%{python3_sitearch}/rbd-*.egg-info rm -rf %{buildroot}%{_libdir}/libcephfs.so.* rm -rf %{buildroot}%{_includedir}/cephfs/libcephfs.h -rm -rf %{buildroot}%{_includedir}/cephfs/ceph_statx.h +rm -rf %{buildroot}%{_includedir}/cephfs/ceph_ll_client.h rm -rf %{buildroot}%{_libdir}/libcephfs.so rm -rf %{buildroot}%{python3_sitearch}/cephfs.cpython*.so rm -rf %{buildroot}%{python3_sitearch}/cephfs-*.egg-info diff --git a/ceph.changes b/ceph.changes index d828b14..fb7bef6 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jun 8 14:18:25 UTC 2020 - Nathan Cutler + +- Up ceph-test disk constraint to address "no space left on device" + build error seen in OBS + +------------------------------------------------------------------- +Fri Jun 5 09:36:19 UTC 2020 - Nathan Cutler + +- Update to 15.2.3-252-gf2237253cd: + + rebase on tip of upstream "octopus" branch, SHA1 22279597fa9ca40ba2f05af9f186a99ce73a6047 + * upstream v15.2.3 release + https://ceph.io/releases/v15-2-3-octopus-released/ + ------------------------------------------------------------------- Mon May 25 12:57:39 UTC 2020 - Nathan Cutler diff --git a/ceph.spec b/ceph.spec index 748538d..d78ff9f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -99,7 +99,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.2.60+gf5864377ab +Version: 15.2.3.252+gf2237253cd Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -115,7 +115,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD- Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-15.2.2-60-gf5864377ab.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.2.3-252-gf2237253cd.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -1121,7 +1121,7 @@ This package provides Ceph’s default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-15.2.2-60-gf5864377ab +%autosetup -p1 -n ceph-15.2.3-252-gf2237253cd %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -1494,6 +1494,7 @@ exit 0 %{_mandir}/man8/ceph-authtool.8* %{_mandir}/man8/ceph-conf.8* %{_mandir}/man8/ceph-dencoder.8* +%{_mandir}/man8/ceph-diff-sorted.8* %{_mandir}/man8/ceph-rbdnamer.8* %{_mandir}/man8/ceph-syn.8* %{_mandir}/man8/ceph-post-file.8* @@ -1506,6 +1507,7 @@ exit 0 %{_mandir}/man8/rbd-replay.8* %{_mandir}/man8/rbd-replay-many.8* %{_mandir}/man8/rbd-replay-prep.8* +%{_mandir}/man8/rgw-orphan-list.8* %dir %{_datadir}/ceph/ %{_datadir}/ceph/known_hosts_drop.ceph.com %{_datadir}/ceph/id_rsa_drop.ceph.com @@ -1923,10 +1925,12 @@ fi %{_mandir}/man8/rbd-nbd.8* %files radosgw +%{_bindir}/ceph-diff-sorted %{_bindir}/radosgw %{_bindir}/radosgw-token %{_bindir}/radosgw-es %{_bindir}/radosgw-object-expirer +%{_bindir}/rgw-orphan-list %{_libdir}/libradosgw.so* %{_mandir}/man8/radosgw.8* %dir %{_localstatedir}/lib/ceph/radosgw @@ -2175,7 +2179,7 @@ fi %files -n libcephfs-devel %dir %{_includedir}/cephfs %{_includedir}/cephfs/libcephfs.h -%{_includedir}/cephfs/ceph_statx.h +%{_includedir}/cephfs/ceph_ll_client.h %{_libdir}/libcephfs.so %files -n python%{python3_pkgversion}-cephfs