rpm/ceph
SHA256
1
0
Fork 0
forked from pool/ceph
Code Pull Requests Activity

Accepting request 905134 from filesystems:ceph:pacific

Browse Source 
bsc#1188111

OBS-URL: https://build.opensuse.org/request/show/905134
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=304
This commit is contained in:
Nathan Cutler 2021-07-08 23:21:14 +00:00 committed by Git OBS Bridge
parent a12c183e75
commit 72776bafd6
6 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-16.2.4-26-g555d38aa5a5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7ac1786be914d358b04c3bf47e90e36362983a7f4344806f2b4610df47550f9
size 126794830

3
ceph-16.2.5-29-g97c2c82c2f5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:910e5124168e4c51901153e9ec6d713514ad9584e1b9f031c3bb6209c7a12c25
size 127010740

18
ceph-test.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Jul 8 19:37:59 UTC 2021 - Nathan Cutler <ncutler@suse.com>
- Update to 16.2.5-29-g97c2c82c2f5:
+ rebased on top of upstream commit SHA1 0883bdea7337b95e4b611c768c0279868462204a
upstream 16.2.5 release
https://ceph.io/releases/v16-2-5-pacific-released/
+ cherry-pick fix for bsc#1188111:
* include/denc: include used header
* mon,osd: always init local variable
* common/Formatter: include used header
-------------------------------------------------------------------
Sat Jun 26 08:44:14 UTC 2021 - Nathan Cutler <ncutler@suse.com>
- Update to 16.2.4-564-g9689286366a:
+ rebased on top of upstream commit SHA1 e57defcbcc91e67aac958c4a52d657a7a907e8ef
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 24 19:10:24 UTC 2021 - Nathan Cutler <ncutler@suse.com> Thu Jun 24 19:10:24 UTC 2021 - Nathan Cutler <ncutler@suse.com>

7
ceph-test.spec
View File

@ -123,7 +123,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 16.2.4.26+g555d38aa5a5 Version: 16.2.5.29+g97c2c82c2f5
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -139,7 +139,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 Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-16.2.4-26-g555d38aa5a5.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-16.2.5-29-g97c2c82c2f5.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source94: ceph-rpmlintrc Source94: ceph-rpmlintrc
Source95: checkin.sh Source95: checkin.sh
@ -592,7 +592,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-16.2.4-26-g555d38aa5a5 %autosetup -p1 -n ceph-16.2.5-29-g97c2c82c2f5
%build %build
# LTO can be enabled as soon as the following GCC bug is fixed: # LTO can be enabled as soon as the following GCC bug is fixed:
@ -934,6 +934,7 @@ rm -rf %{buildroot}%{_datadir}/ceph/mgr/iostat
rm -rf %{buildroot}%{_datadir}/ceph/mgr/localpool rm -rf %{buildroot}%{_datadir}/ceph/mgr/localpool
rm -rf %{buildroot}%{_datadir}/ceph/mgr/mds_autoscaler rm -rf %{buildroot}%{_datadir}/ceph/mgr/mds_autoscaler
rm -rf %{buildroot}%{_datadir}/ceph/mgr/mirroring rm -rf %{buildroot}%{_datadir}/ceph/mgr/mirroring
rm -rf %{buildroot}%{_datadir}/ceph/mgr/nfs
rm -rf %{buildroot}%{_datadir}/ceph/mgr/orchestrator rm -rf %{buildroot}%{_datadir}/ceph/mgr/orchestrator
rm -rf %{buildroot}%{_datadir}/ceph/mgr/osd_perf_query rm -rf %{buildroot}%{_datadir}/ceph/mgr/osd_perf_query
rm -rf %{buildroot}%{_datadir}/ceph/mgr/osd_support rm -rf %{buildroot}%{_datadir}/ceph/mgr/osd_support

18
ceph.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Jul 8 19:37:59 UTC 2021 - Nathan Cutler <ncutler@suse.com>
- Update to 16.2.5-29-g97c2c82c2f5:
+ rebased on top of upstream commit SHA1 0883bdea7337b95e4b611c768c0279868462204a
upstream 16.2.5 release
https://ceph.io/releases/v16-2-5-pacific-released/
+ cherry-pick fix for bsc#1188111:
* include/denc: include used header
* mon,osd: always init local variable
* common/Formatter: include used header
-------------------------------------------------------------------
Sat Jun 26 08:44:14 UTC 2021 - Nathan Cutler <ncutler@suse.com>
- Update to 16.2.4-564-g9689286366a:
+ rebased on top of upstream commit SHA1 e57defcbcc91e67aac958c4a52d657a7a907e8ef
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 24 19:10:24 UTC 2021 - Nathan Cutler <ncutler@suse.com> Thu Jun 24 19:10:24 UTC 2021 - Nathan Cutler <ncutler@suse.com>

7
ceph.spec
View File

@ -123,7 +123,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 16.2.4.26+g555d38aa5a5 Version: 16.2.5.29+g97c2c82c2f5
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -139,7 +139,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 Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-16.2.4-26-g555d38aa5a5.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-16.2.5-29-g97c2c82c2f5.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -1209,7 +1209,7 @@ This package provides Ceph default alerts for Prometheus.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-16.2.4-26-g555d38aa5a5 %autosetup -p1 -n ceph-16.2.5-29-g97c2c82c2f5
%build %build
# LTO can be enabled as soon as the following GCC bug is fixed: # LTO can be enabled as soon as the following GCC bug is fixed:
@ -1775,6 +1775,7 @@ fi
%{_datadir}/ceph/mgr/localpool %{_datadir}/ceph/mgr/localpool
%{_datadir}/ceph/mgr/mds_autoscaler %{_datadir}/ceph/mgr/mds_autoscaler
%{_datadir}/ceph/mgr/mirroring %{_datadir}/ceph/mgr/mirroring
%{_datadir}/ceph/mgr/nfs
%{_datadir}/ceph/mgr/orchestrator %{_datadir}/ceph/mgr/orchestrator
%{_datadir}/ceph/mgr/osd_perf_query %{_datadir}/ceph/mgr/osd_perf_query
%{_datadir}/ceph/mgr/osd_support %{_datadir}/ceph/mgr/osd_support