diff --git a/.ceph.metadata b/.ceph.metadata index e69de29..46c8ba1 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -0,0 +1 @@ +5e498010010d63c0dc1dd6bde2a64a2524fbafa3 SOURCES/ceph-14.2.10.tar.gz diff --git a/README.md b/README.md index 80a3d35..0fcdb28 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,6 @@ E.g. build the src.rpm with: To build: - $ `cbs build [--scratch] storage7-ceph-nautilus-el7 ceph-14.2.9-1.el7.src.rpm` + $ cbs build [--scratch] storage7-ceph-nautilus-el7 ceph-14.2.10-1.el7.src.rpm diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index d54d62c..e511897 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -36,16 +36,18 @@ %if 0%{?fedora} || 0%{?rhel} %bcond_without selinux %bcond_without cephfs_java +%bcond_without amqp_endpoint %bcond_without lttng %bcond_without libradosstriper %bcond_without ocf -%bcond_without amqp_endpoint +%bcond_without kafka_endpoint %global _remote_tarball_prefix https://download.ceph.com/tarballs/ %endif %if 0%{?suse_version} %bcond_with selinux %bcond_with cephfs_java %bcond_with amqp_endpoint +%bcond_with kafka_endpoint #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %global _fillupdir /var/adm/fillup-templates @@ -81,7 +83,9 @@ %if 0%{without python2} %global _defined_if_python2_absent 1 %endif - +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 +%global weak_deps 1 +%endif %if %{with selinux} # get selinux policy version %{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0} @@ -106,7 +110,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.2.9 +Version: 14.2.10 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -199,6 +203,9 @@ BuildRequires: yasm %if 0%{with amqp_endpoint} BuildRequires: librabbitmq-devel %endif +%if 0%{with kafka_endpoint} +BuildRequires: librdkafka-devel +%endif %if 0%{with make_check} BuildRequires: jq BuildRequires: libuuid-devel @@ -208,13 +215,7 @@ BuildRequires: python%{_python_buildid}-nose BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-requests BuildRequires: python%{_python_buildid}-six -BuildRequires: python%{_python_buildid}-tox BuildRequires: python%{_python_buildid}-virtualenv -%if 0%{?rhel} == 7 -BuildRequires: pyOpenSSL%{_python_buildid} -%else -BuildRequires: python%{_python_buildid}-pyOpenSSL -%endif BuildRequires: socat %endif %if 0%{with seastar} @@ -281,9 +282,19 @@ BuildRequires: lz4-devel >= 1.7 # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} +BuildRequires: python%{_python_buildid}-coverage +BuildRequires: python%{_python_buildid}-pecan +BuildRequires: python%{_python_buildid}-tox +BuildRequires: xmlsec1 +%if 0%{?rhel} == 7 +BuildRequires: pyOpenSSL%{_python_buildid} +%else +BuildRequires: python%{_python_buildid}-pyOpenSSL +%endif BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-jwt BuildRequires: python%{_python_buildid}-routes +BuildRequires: python%{_python_buildid}-scipy BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: xmlsec1 %endif @@ -292,7 +303,11 @@ BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-PyJWT BuildRequires: python%{_python_buildid}-Routes BuildRequires: python%{_python_buildid}-Werkzeug +BuildRequires: python%{_python_buildid}-coverage BuildRequires: python%{_python_buildid}-numpy-devel +BuildRequires: python%{_python_buildid}-pecan +BuildRequires: python%{_python_buildid}-pyOpenSSL +BuildRequires: python%{_python_buildid}-tox BuildRequires: rpm-build BuildRequires: xmlsec1-devel %endif @@ -329,6 +344,9 @@ BuildRequires: libcryptopp-devel BuildRequires: libnuma-devel %endif %endif +%if 0%{?rhel} >= 8 +BuildRequires: /usr/bin/pathfix.py +%endif %description Ceph is a massively scalable, open-source, distributed storage system that runs @@ -359,7 +377,6 @@ Requires: grep Requires: logrotate Requires: parted Requires: psmisc -Requires: python%{_python_buildid}-requests Requires: python%{_python_buildid}-setuptools Requires: util-linux Requires: xfsprogs @@ -371,7 +388,7 @@ Requires: which Requires: gperftools-libs >= 2.6.1 %endif %endif -%if 0%{?suse_version} +%if 0%{?weak_deps} Recommends: chrony %endif %description base @@ -390,7 +407,6 @@ Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-requests %if 0%{?fedora} || 0%{?rhel} Requires: python%{_python_buildid}-prettytable %endif @@ -440,6 +456,7 @@ Group: System/Filesystems Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-bcrypt Requires: python%{_python_buildid}-pecan +Requires: python%{_python_buildid}-requests Requires: python%{_python_buildid}-six %if 0%{?fedora} || 0%{?rhel} Requires: python%{_python_buildid}-cherrypy @@ -448,13 +465,15 @@ Requires: python%{_python_buildid}-werkzeug %if 0%{?suse_version} Requires: python%{_python_buildid}-CherryPy Requires: python%{_python_buildid}-Werkzeug -Recommends: python%{_python_buildid}-influxdb +%endif +%if 0%{?weak_deps} Recommends: ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-k8sevents = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release} +Recommends: python%{_python_buildid}-influxdb %endif %if 0%{?rhel} == 7 Requires: pyOpenSSL @@ -480,6 +499,9 @@ Requires: python%{_python_buildid}-cherrypy Requires: python%{_python_buildid}-jwt Requires: python%{_python_buildid}-routes Requires: python%{_python_buildid}-werkzeug +%if 0%{?weak_deps} +Recommends: python%{_python_buildid}-saml +%endif %endif %if 0%{?suse_version} Requires: python%{_python_buildid}-CherryPy @@ -1221,6 +1243,11 @@ ${CMAKE} .. \ %else -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \ %endif +%if 0%{with kafka_endpoint} + -DWITH_RADOSGW_KAFKA_ENDPOINT=ON \ +%else + -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ +%endif -DBOOST_J=$CEPH_SMP_NCPUS \ %if 0%{with ceph_test_package} -DWITH_SYSTEM_GTEST=ON \ @@ -1273,6 +1300,11 @@ 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 +%if 0%{?rhel} >= 8 +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_sbindir}/* +%endif + #set up placeholder directories mkdir -p %{buildroot}%{_sysconfdir}/ceph mkdir -p %{buildroot}%{_localstatedir}/run/ceph @@ -2081,7 +2113,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 %if 0%{with python2}