From 62fe6ff0a58ef535a85915cfd7827a9ca30ca53c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 15 Feb 2018 16:37:22 -0500 Subject: [PATCH 1/2] %ldconfig_scriptlets Signed-off-by: Kaleb S. KEITHLEY --- ceph.spec | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/ceph.spec b/ceph.spec index 7034a38..29fd688 100644 --- a/ceph.spec +++ b/ceph.spec @@ -86,7 +86,7 @@ ################################################################################# Name: ceph Version: 12.2.2 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 %endif @@ -272,6 +272,8 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif +Requires(post):/sbin/ldconfig +Requires(postun):/sbin/ldconfig Requires: python Requires: python-requests Requires: python-setuptools @@ -1526,6 +1528,7 @@ fi %endif +%ldconfig_scriptlets -n librados2 %files -n librados2 %{_libdir}/librados.so.* %dir %{_libdir}/ceph @@ -1534,10 +1537,6 @@ fi %{_libdir}/librados_tp.so.* %endif -%post -n librados2 -p /sbin/ldconfig - -%postun -n librados2 -p /sbin/ldconfig - %files -n librados-devel %dir %{_includedir}/rados %{_includedir}/rados/librados.h @@ -1565,29 +1564,23 @@ fi %{python3_sitearch}/rados.cpython*.so %{python3_sitearch}/rados-*.egg-info +%ldconfig_scriptlets -n libradosstriper1 %files -n libradosstriper1 %{_libdir}/libradosstriper.so.* -%post -n libradosstriper1 -p /sbin/ldconfig - -%postun -n libradosstriper1 -p /sbin/ldconfig - %files -n libradosstriper-devel %dir %{_includedir}/radosstriper %{_includedir}/radosstriper/libradosstriper.h %{_includedir}/radosstriper/libradosstriper.hpp %{_libdir}/libradosstriper.so +%ldconfig_scriptlets -n librbd1 %files -n librbd1 %{_libdir}/librbd.so.* %if %{with lttng} %{_libdir}/librbd_tp.so.* %endif -%post -n librbd1 -p /sbin/ldconfig - -%postun -n librbd1 -p /sbin/ldconfig - %files -n librbd-devel %dir %{_includedir}/rbd %{_includedir}/rbd/librbd.h @@ -1598,13 +1591,10 @@ fi %{_libdir}/librbd_tp.so %endif +%ldconfig_scriptlets -n librgw2 %files -n librgw2 %{_libdir}/librgw.so.* -%post -n librgw2 -p /sbin/ldconfig - -%postun -n librgw2 -p /sbin/ldconfig - %files -n librgw-devel %dir %{_includedir}/rados %{_includedir}/rados/librgw.h @@ -1627,13 +1617,10 @@ fi %{python3_sitearch}/rbd.cpython*.so %{python3_sitearch}/rbd-*.egg-info +%ldconfig_scriptlets -n libcephfs2 %files -n libcephfs2 %{_libdir}/libcephfs.so.* -%post -n libcephfs2 -p /sbin/ldconfig - -%postun -n libcephfs2 -p /sbin/ldconfig - %files -n libcephfs-devel %dir %{_includedir}/cephfs %{_includedir}/cephfs/libcephfs.h @@ -1695,13 +1682,10 @@ fi %endif %if 0%{with cephfs_java} +%ldconfig_scriptlets -n libcephfs_jni1 %files -n libcephfs_jni1 %{_libdir}/libcephfs_jni.so.* -%post -n libcephfs_jni1 -p /sbin/ldconfig - -%postun -n libcephfs_jni1 -p /sbin/ldconfig - %files -n libcephfs_jni-devel %{_libdir}/libcephfs_jni.so @@ -1812,6 +1796,9 @@ exit 0 %changelog +* Thu Feb 15 2018 Kaleb S. KEITHLEY - 1:12.2.2-2 +- %%ldconfig_scriptlets + * Tue Dec 5 2017 Kaleb S. KEITHLEY - 1:12.2.2-1 - New release (1:12.2.2-1) - Fix build error on arm From d40e5a4fa7f266909774fe8538dafeaa6351fec3 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 21 Feb 2018 14:26:53 -0500 Subject: [PATCH 2/2] New release (1:12.2.3-1) Signed-off-by: Kaleb S. KEITHLEY --- 0004-cmake-modules-BuildBoost.cmake.patch | 11 +++++ ceph.spec | 60 +++++++++++++---------- sources | 2 +- 3 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 0004-cmake-modules-BuildBoost.cmake.patch diff --git a/0004-cmake-modules-BuildBoost.cmake.patch b/0004-cmake-modules-BuildBoost.cmake.patch new file mode 100644 index 0000000..644a6c4 --- /dev/null +++ b/0004-cmake-modules-BuildBoost.cmake.patch @@ -0,0 +1,11 @@ +--- ceph-12.2.3/cmake/modules/BuildBoost.cmake.orig 2018-02-21 14:13:32.527899631 -0500 ++++ ceph-12.2.3/cmake/modules/BuildBoost.cmake 2018-02-21 14:14:04.796899631 -0500 +@@ -75,7 +75,7 @@ + set(install_command + ${b2} install) + set(boost_root_dir "${CMAKE_BINARY_DIR}/boost") +- if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/libs/config/include/boost/config.hpp") ++ if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/boost/config.hpp") + message(STATUS "boost already in src") + set(source_dir + SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost") diff --git a/ceph.spec b/ceph.spec index 29fd688..a3ac8f5 100644 --- a/ceph.spec +++ b/ceph.spec @@ -85,8 +85,8 @@ # main package definition ################################################################################# Name: ceph -Version: 12.2.2 -Release: 2%{?dist} +Version: 12.2.3 +Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 %endif @@ -106,6 +106,7 @@ Patch001: 0001-src-rocksdb-util-murmurhash.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1474774 Patch002: 0002-cmake-Support-ppc64.patch Patch003: 0003-librbd-Conditionally-import-TrimRequest.cc.patch +Patch004: 0004-cmake-modules-BuildBoost.cmake.patch %if 0%{?suse_version} %if 0%{?is_opensuse} ExclusiveArch: x86_64 aarch64 ppc64 ppc64le @@ -356,11 +357,13 @@ Group: System/Filesystems Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} Requires: python-cherrypy +Requires: python-jinja2 Requires: python-werkzeug Requires: pyOpenSSL %endif %if 0%{?suse_version} -Requires: python-CherryPy +Requires: python-CherryPy +Requires: python-jinja2 Requires: python-Werkzeug Requires: python-pyOpenSSL %endif @@ -459,6 +462,7 @@ Requires: gdisk Requires: gptfdisk %endif Requires: parted +Requires: lvm2 %description osd ceph-osd is the object storage daemon for the Ceph distributed file system. It is responsible for storing objects on a local file system @@ -714,7 +718,7 @@ Summary: Ceph benchmarks and test tools %if 0%{?suse_version} Group: System/Benchmark %endif -Requires: ceph-common +Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: xmlstarlet Requires: jq Requires: socat @@ -890,9 +894,9 @@ cmake .. \ -DWITH_OCF=ON \ %endif %ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 - -DWITH_RADOSGW_BEAST_FRONTEND=ON \ + -DWITH_BOOST_CONTEXT=ON \ %else - -DWITH_RADOSGW_BEAST_FRONTEND=OFF \ + -DWITH_BOOST_CONTEXT=OFF \ %endif %ifnarch %{arm} -DWITH_RDMA=OFF \ @@ -932,7 +936,7 @@ mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING -install -m 0644 -D src/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf +install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} @@ -980,13 +984,12 @@ rm -rf %{buildroot} %{_bindir}/crushtool %{_bindir}/monmaptool %{_bindir}/osdmaptool +%{_bindir}/ceph-kvstore-tool %{_bindir}/ceph-run %{_bindir}/ceph-detect-init %{_libexecdir}/systemd/system-preset/50-ceph.preset %{_sbindir}/ceph-create-keys %{_sbindir}/ceph-disk -%{_sbindir}/ceph-volume -%{_sbindir}/ceph-volume-systemd %{_sbindir}/rcceph %dir %{_libexecdir}/ceph %{_libexecdir}/ceph/ceph_common.sh @@ -1015,7 +1018,6 @@ rm -rf %{buildroot} %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %endif %{_unitdir}/ceph-disk@.service -%{_unitdir}/ceph-volume@.service %{_unitdir}/ceph.target %{python_sitelib}/ceph_detect_init* %{python_sitelib}/ceph_disk* @@ -1026,12 +1028,11 @@ rm -rf %{buildroot} %{_mandir}/man8/ceph-detect-init.8* %{_mandir}/man8/ceph-create-keys.8* %{_mandir}/man8/ceph-disk.8* -%{_mandir}/man8/ceph-volume.8* -%{_mandir}/man8/ceph-volume-systemd.8* %{_mandir}/man8/ceph-run.8* %{_mandir}/man8/crushtool.8* %{_mandir}/man8/osdmaptool.8* %{_mandir}/man8/monmaptool.8* +%{_mandir}/man8/ceph-kvstore-tool.8* #set up placeholder directories %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/tmp %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd @@ -1045,12 +1046,11 @@ rm -rf %{buildroot} %if 0%{?suse_version} %fillup_only if [ $1 -eq 1 ] ; then - /usr/bin/systemctl preset ceph-disk@\*.service ceph.target >/dev/null 2>&1 || : +/usr/bin/systemctl preset ceph-disk@\*.service ceph.target >/dev/null 2>&1 || : fi %endif %if 0%{?fedora} || 0%{?rhel} %systemd_post ceph-disk@\*.service ceph.target -%systemd_post ceph-volume@\*.service ceph.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph.target >/dev/null 2>&1 || : @@ -1062,7 +1062,6 @@ fi %endif %if 0%{?fedora} || 0%{?rhel} %systemd_preun ceph-disk@\*.service ceph.target -%systemd_preun ceph-volume@\*.service ceph.target %endif %postun base @@ -1083,7 +1082,7 @@ if [ $FIRST_ARG -ge 1 ] ; then source $SYSCONF_CEPH fi if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then - /usr/bin/systemctl try-restart ceph-disk@\*.service ceph-volume@\*.service > /dev/null 2>&1 || : + /usr/bin/systemctl try-restart ceph-disk@\*.service > /dev/null 2>&1 || : fi fi @@ -1287,6 +1286,7 @@ fi %files mon %{_bindir}/ceph-mon %{_bindir}/ceph-rest-api +%{_bindir}/ceph-monstore-tool %{_mandir}/man8/ceph-mon.8* %{_mandir}/man8/ceph-rest-api.8* %{python_sitelib}/ceph_rest_api.py* @@ -1455,26 +1455,32 @@ fi %{_bindir}/ceph-clsinfo %{_bindir}/ceph-bluestore-tool %{_bindir}/ceph-objectstore-tool +%{_bindir}/ceph-osdomap-tool %{_bindir}/ceph-osd %{_libexecdir}/ceph/ceph-osd-prestart.sh +%{_sbindir}/ceph-volume +%{_sbindir}/ceph-volume-systemd %dir %{_udevrulesdir} %{_udevrulesdir}/60-ceph-by-parttypeuuid.rules %{_udevrulesdir}/95-ceph-osd.rules %{_mandir}/man8/ceph-clsinfo.8* %{_mandir}/man8/ceph-osd.8* %{_mandir}/man8/ceph-bluestore-tool.8* +%{_mandir}/man8/ceph-volume.8* +%{_mandir}/man8/ceph-volume-systemd.8* %if ( ( 0%{?rhel} && 0%{?rhel} <= 7) && ! 0%{?centos} ) %attr(0755,-,-) %{_sysconfdir}/cron.hourly/subman %endif %{_unitdir}/ceph-osd@.service %{_unitdir}/ceph-osd.target +%{_unitdir}/ceph-volume@.service %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd %config(noreplace) %{_sysctldir}/90-ceph-osd.conf %post osd %if 0%{?suse_version} if [ $1 -eq 1 ] ; then - /usr/bin/systemctl preset ceph-osd@\*.service ceph-osd.target >/dev/null 2>&1 || : + /usr/bin/systemctl preset ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target >/dev/null 2>&1 || : fi %if 0%{?sysctl_apply} %sysctl_apply 90-ceph-osd.conf @@ -1483,7 +1489,7 @@ fi %endif %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_post ceph-osd@\*.service ceph-osd.target +%systemd_post ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || : @@ -1491,20 +1497,20 @@ fi %preun osd %if 0%{?suse_version} -%service_del_preun ceph-osd@\*.service ceph-osd.target +%service_del_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_preun ceph-osd@\*.service ceph-osd.target +%systemd_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %endif %postun osd test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-osd@\*.service ceph-osd.target +%service_del_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_postun ceph-osd@\*.service ceph-osd.target +%systemd_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1514,7 +1520,7 @@ if [ $FIRST_ARG -ge 1 ] ; then source $SYSCONF_CEPH fi if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then - /usr/bin/systemctl try-restart ceph-osd@\*.service > /dev/null 2>&1 || : + /usr/bin/systemctl try-restart ceph-osd@\*.service ceph-volume@\*.service > /dev/null 2>&1 || : fi fi @@ -1524,7 +1530,7 @@ fi %dir %{_prefix}/lib/ocf %dir %{_prefix}/lib/ocf/resource.d %dir %{_prefix}/lib/ocf/resource.d/ceph -%{_prefix}/lib/ocf/resource.d/ceph/rbd +%attr(0755,-,-) %{_prefix}/lib/ocf/resource.d/ceph/rbd %endif @@ -1672,9 +1678,6 @@ fi %{_bindir}/ceph_tpbench %{_bindir}/ceph_xattr_bench %{_bindir}/ceph-coverage -%{_bindir}/ceph-monstore-tool -%{_bindir}/ceph-osdomap-tool -%{_bindir}/ceph-kvstore-tool %{_bindir}/ceph-debugpack %{_mandir}/man8/ceph-debugpack.8* %dir %{_libdir}/ceph @@ -1796,6 +1799,9 @@ exit 0 %changelog +* Wed Feb 21 2018 Kaleb S. KEITHLEY - 1:12.2.3-1 +- New release (1:12.2.3-1) + * Thu Feb 15 2018 Kaleb S. KEITHLEY - 1:12.2.2-2 - %%ldconfig_scriptlets diff --git a/sources b/sources index de58d58..bc2f72b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ceph-12.2.2.tar.gz) = 89b166dc4b58e0110ebe0147eef9f47e1090ccee01702b3f72cfbdca856d02bf03b2663de9e88c84b21a2a61f8f92211e217a05b8bdcf7d5de3158adbe49db88 +SHA512 (ceph-12.2.3.tar.gz) = 3cdc105a64a68b07f55e9ea5cb8880e3eac882937313a2a8e454e34325443cee1675413d3e2148f944ecaf32be35a1384bd0a662ca58bdb2d2ab3c9eff518cd2