diff --git a/ceph-16.0.0-4863-g5d95d9d41d.tar.bz2 b/ceph-16.0.0-4863-g5d95d9d41d.tar.bz2 deleted file mode 100644 index 419197f..0000000 --- a/ceph-16.0.0-4863-g5d95d9d41d.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eae8a5f4c6bbfd139377b121d1ebc5c66fe71075066bdf26ba8d1939490584fa -size 121784127 diff --git a/ceph-16.0.0-5613-gb1a0951432.tar.bz2 b/ceph-16.0.0-5613-gb1a0951432.tar.bz2 new file mode 100644 index 0000000..448926f --- /dev/null +++ b/ceph-16.0.0-5613-gb1a0951432.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e395be677242cb0142e5ddaf5463ff0a33d2818b0f2c450d9839d0e813bc78e +size 123870645 diff --git a/ceph-test.changes b/ceph-test.changes index e1827f3..3e454f4 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 18 09:58:45 UTC 2020 - Nathan Cutler + +- Update to 16.0.0-5613-gb1a0951432: + + rebase on tip of upstream "master" branch, SHA1 5df5d8f8ff463f2560180dc8e9722d6690b0fa12 + ------------------------------------------------------------------- Thu Sep 3 17:51:07 UTC 2020 - Nathan Cutler diff --git a/ceph-test.spec b/ceph-test.spec index c98beab..2433e2e 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -94,7 +94,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 16.0.0.4863+g5d95d9d41d +Version: 16.0.0.5613+gb1a0951432 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -110,7 +110,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-16.0.0-4863-g5d95d9d41d.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.0.0-5613-gb1a0951432.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -360,8 +360,10 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{?suse_version} %endif +%if ! 0%{?suse_version} %if 0%{?weak_deps} %endif +%endif %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} @@ -422,6 +424,8 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{?suse_version} %endif +%if 0%{?suse_version} +%endif %if 0%{with selinux} %endif %if 0%{?rhel} || 0%{?fedora} @@ -507,7 +511,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-16.0.0-4863-g5d95d9d41d +%autosetup -p1 -n ceph-16.0.0-5613-gb1a0951432 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -604,7 +608,7 @@ ${CMAKE} .. \ %if 0%{with ocf} -DWITH_OCF=ON \ %endif -%ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 +%ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 s390x -DWITH_BOOST_CONTEXT=ON \ %else -DWITH_BOOST_CONTEXT=OFF \ @@ -696,7 +700,6 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules # sudoers.d install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl -install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm %if 0%{?rhel} >= 8 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* @@ -773,7 +776,6 @@ rm -rf %{buildroot}%{_mandir}/man8/monmaptool.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-kvstore-tool.8* rm -rf %{buildroot}%{_sbindir}/cephadm rm -rf %{buildroot}%{_mandir}/man8/cephadm.8* -rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/cephadm rm -rf %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys rm -rf %{buildroot}%doc rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf @@ -844,6 +846,7 @@ rm -rf %{buildroot}%{_datadir}/ceph/mgr/localpool rm -rf %{buildroot}%{_datadir}/ceph/mgr/mds_autoscaler rm -rf %{buildroot}%{_datadir}/ceph/mgr/orchestrator rm -rf %{buildroot}%{_datadir}/ceph/mgr/osd_perf_query +rm -rf %{buildroot}%{_datadir}/ceph/mgr/osd_support rm -rf %{buildroot}%{_datadir}/ceph/mgr/pg_autoscaler rm -rf %{buildroot}%{_datadir}/ceph/mgr/progress rm -rf %{buildroot}%{_datadir}/ceph/mgr/prometheus @@ -870,6 +873,7 @@ rm -rf %{buildroot}%{_mandir}/man8/ceph-fuse.8* rm -rf %{buildroot}%{_sbindir}/mount.fuse.ceph rm -rf %{buildroot}%{_unitdir}/ceph-fuse@.service rm -rf %{buildroot}%{_unitdir}/ceph-fuse.target +rm -rf %{buildroot}%{_bindir}/cephfs-mirror rm -rf %{buildroot}%{_bindir}/rbd-fuse rm -rf %{buildroot}%{_mandir}/man8/rbd-fuse.8* rm -rf %{buildroot}%{_bindir}/rbd-mirror diff --git a/ceph.changes b/ceph.changes index e1827f3..3e454f4 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 18 09:58:45 UTC 2020 - Nathan Cutler + +- Update to 16.0.0-5613-gb1a0951432: + + rebase on tip of upstream "master" branch, SHA1 5df5d8f8ff463f2560180dc8e9722d6690b0fa12 + ------------------------------------------------------------------- Thu Sep 3 17:51:07 UTC 2020 - Nathan Cutler diff --git a/ceph.spec b/ceph.spec index 74ff6b5..62ee76f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -94,7 +94,7 @@ # main package definition ################################################################################# Name: ceph -Version: 16.0.0.4863+g5d95d9d41d +Version: 16.0.0.5613+gb1a0951432 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -110,7 +110,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-16.0.0-4863-g5d95d9d41d.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.0.0-5613-gb1a0951432.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -385,11 +385,14 @@ Summary: Utility to bootstrap Ceph clusters Requires: lvm2 %if 0%{?suse_version} Requires: apparmor-abstractions +Requires: podman %endif Requires: python%{python3_pkgversion} +%if ! 0%{?suse_version} %if 0%{?weak_deps} Recommends: podman %endif +%endif %description -n cephadm Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed with systemd and podman. @@ -603,6 +606,17 @@ Requires: python%{python3_pkgversion} %description fuse FUSE based client for Ceph distributed network file system +%package -n cephfs-mirror +Summary: Ceph daemon for mirroring CephFS snapshots +%if 0%{?suse_version} +Group: System/Filesystems +%endif +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +%description -n cephfs-mirror +Daemon for mirroring CephFS snapshots between Ceph clusters. + %package -n rbd-fuse Summary: Ceph fuse-based client %if 0%{?suse_version} @@ -1054,7 +1068,7 @@ project "node_exporter" module. The dashboards are designed to be integrated with the Ceph Manager Dashboard web UI. %package prometheus-alerts -Summary: Prometheus alerts for a Ceph deplyoment +Summary: Prometheus alerts for a Ceph deployment BuildArch: noarch Group: System/Monitoring %description prometheus-alerts @@ -1064,7 +1078,7 @@ This package provides Ceph’s default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-16.0.0-4863-g5d95d9d41d +%autosetup -p1 -n ceph-16.0.0-5613-gb1a0951432 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -1161,7 +1175,7 @@ ${CMAKE} .. \ %if 0%{with ocf} -DWITH_OCF=ON \ %endif -%ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 +%ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 s390x -DWITH_BOOST_CONTEXT=ON \ %else -DWITH_BOOST_CONTEXT=OFF \ @@ -1253,7 +1267,6 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules # sudoers.d install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl -install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm %if 0%{?rhel} >= 8 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* @@ -1416,7 +1429,6 @@ exit 0 %files -n cephadm %{_sbindir}/cephadm %{_mandir}/man8/cephadm.8* -%{_sysconfdir}/sudoers.d/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys @@ -1651,6 +1663,7 @@ fi %{_datadir}/ceph/mgr/mds_autoscaler %{_datadir}/ceph/mgr/orchestrator %{_datadir}/ceph/mgr/osd_perf_query +%{_datadir}/ceph/mgr/osd_support %{_datadir}/ceph/mgr/pg_autoscaler %{_datadir}/ceph/mgr/progress %{_datadir}/ceph/mgr/prometheus @@ -1760,6 +1773,9 @@ fi %{_unitdir}/ceph-fuse@.service %{_unitdir}/ceph-fuse.target +%files -n cephfs-mirror +%{_bindir}/cephfs-mirror + %files -n rbd-fuse %{_bindir}/rbd-fuse %{_mandir}/man8/rbd-fuse.8*