SHA256
1
0
forked from pool/ceph

Accepting request 498461 from filesystems:ceph

1

OBS-URL: https://build.opensuse.org/request/show/498461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2017-05-27 11:09:38 +00:00 committed by Git OBS Bridge
commit ded6e0999b
9 changed files with 210 additions and 33 deletions

View File

@ -9,7 +9,7 @@
</conditions>
<hardware>
<disk>
<size unit="G">26</size>
<size unit="G">28</size>
</disk>
<memory>
<size unit="G">8</size>

View File

@ -1,8 +1,8 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="versionformat">12.0.2+git.%ct.%h</param>
<param name="versionformat">12.0.3+git.%ct.%h</param>
<param name="url">git://github.com/SUSE/ceph.git</param>
<param name="revision">wip-msse</param>
<param name="revision">ses5</param>
<param name="filename">ceph</param>
<param name="scm">git</param>
<param name="package-meta">no</param>

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/SUSE/ceph.git</param>
<param name="changesrevision">8c88dc67b2eb6eba916fdcce5a3c3d86592a11c9</param></service></servicedata>
<param name="changesrevision">23dd2b67dc4068018f22570be4154e06ed5f5a49</param></service></servicedata>

View File

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

View File

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

View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Fri May 26 11:39:01 UTC 2017 - ncutler@suse.com
- Update to version 12.0.3+git.1495798013.23dd2b67dc:
+ ceph.spec.in: re-drop %{epoch}: prefixes
-------------------------------------------------------------------
Fri May 26 08:57:00 UTC 2017 - ncutler@suse.com
- Update to version 12.0.3+git.1495787939.3f6446f64f:
+ build/ops: rpm: adapt License line to Release 2.0 of SPDX spec
(issue#20091)
-------------------------------------------------------------------
Fri May 26 04:35:06 UTC 2017 - ncutler@suse.com
- Update to version 12.0.3+git.1495675338.07282a4057:
+ upstream 12.0.3 release
+ osd/PG: Add two new mClock implementations of the PG sharded operator queue
(pr#14997, bsc#1040103)
+ build/ops: rpm: make librbd1 %post scriptlet depend on coreutils (boo#1040230)
+ build/ops: rpm: move RDMA build dependency to distro-conditional section
+ build/ops: rpm: move python-prettytable to distro-conditional section
+ cmake: added empty RPATH to libcls_sdk.so
+ rpm: drop %{epoch} from new rados-objclass-devel subpackage
+ cmake: fix boost components for WITH_SYSTEM_BOOST
+ cmake: build boost::context only if rgw Beast frontend is in use
+ build/ops: rpm: reverse s390 bcond conditional block
+ build/ops: rpm: no rgw Beast frontend on s390x (bsc#1040119)
+ ceph.spec.in, debian/control: build/runtime dependency for cherrypy
-------------------------------------------------------------------
Wed May 10 09:00:11 UTC 2017 - ncutler@suse.com
- Update to version 12.0.2+git.1494343993.7527e4f0b8:
+ ReplicatedPG: drop CACHE_PIN->WRITESAME req translation (bsc#1038063)
-------------------------------------------------------------------
Tue May 9 09:17:19 UTC 2017 - ncutler@suse.com
- _constraints: up ceph.spec disk constraint to 28G after seeing a
build failure in OBS
-------------------------------------------------------------------
Fri Apr 28 01:22:07 UTC 2017 - ddiss@suse.com
- Update to version 12.0.2+git.1493341348.9148e53:
+ ceph osd: add support for new op cmpext
+ ceph_test_rados_api_misc: add cmpext tests
+ librados: add cmpext API
+ ceph_test_rados_api_aio: add cmpext tests
+ test/librados/c_operations: add cmpext tests
This patchset is a straight cherry-pick of the upstream OSD/librados cmpext
changes (bsc#1035937).
-------------------------------------------------------------------
Thu Apr 27 11:39:24 UTC 2017 - ncutler@suse.com

View File

@ -22,11 +22,12 @@
%endif
%bcond_with make_check
%bcond_with xio
%ifnarch s390 s390x
%bcond_without tcmalloc
%else
# no gperftools/tcmalloc on s390(x)
%ifarch s390 s390x
%bcond_with tcmalloc
%bcond_with rgw_beast
%else
%bcond_without tcmalloc
%bcond_without rgw_beast
%endif
%bcond_without lowmem_builder
%bcond_with minimal_debugging_information
@ -69,10 +70,10 @@
# main package definition
#################################################################################
Name: ceph-test
Version: 12.0.2+git.1493295295.8c88dc6
Release: 0
Version: 12.0.3+git.1495798013.23dd2b67dc
Release: 0%{?dist}
Summary: Ceph benchmarks and test tools
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0 WITH Autoconf-exception-2.0 and BSD-3-Clause and MIT
%if 0%{?suse_version}
Group: System/Filesystems
%endif
@ -115,7 +116,7 @@ BuildRequires: fuse-devel
BuildRequires: gcc-c++
BuildRequires: gdbm
%if 0%{with tcmalloc}
BuildRequires: gperftools-devel
BuildRequires: gperftools-devel >= 2.4
%endif
BuildRequires: jq
BuildRequires: leveldb-devel > 1.2
@ -135,7 +136,6 @@ BuildRequires: python
BuildRequires: python-devel
BuildRequires: python-nose
BuildRequires: python-requests
BuildRequires: python-sphinx
BuildRequires: python-virtualenv
BuildRequires: snappy-devel
BuildRequires: udev
@ -145,7 +145,6 @@ BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet
BuildRequires: yasm
BuildRequires: libibverbs-devel
#################################################################################
# distro-conditional dependencies
@ -164,7 +163,11 @@ BuildRequires: keyutils-devel
BuildRequires: libopenssl-devel
BuildRequires: lsb-release
BuildRequires: openldap2-devel
BuildRequires: python-CherryPy
BuildRequires: python-Cython
BuildRequires: python-PrettyTable
BuildRequires: python-Sphinx
BuildRequires: rdma-core-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
@ -172,10 +175,14 @@ BuildRequires: boost-random
BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
BuildRequires: libibverbs-devel
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: redhat-lsb-core
BuildRequires: Cython
BuildRequires: python-cherrypy
BuildRequires: python-prettytable
BuildRequires: python-sphinx
%endif
# python34-... for RHEL, python3-... for all other supported distros
%if 0%{?rhel}
@ -232,6 +239,10 @@ This package contains Ceph benchmarks and test tools.
%endif
%if 0%{?suse_version}
%endif
%if 0%{?fedora} || 0%{?rhel}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{with xio}
@ -246,6 +257,10 @@ This package contains Ceph benchmarks and test tools.
%endif
%if 0%{?suse_version}
%endif
%if 0%{?fedora} || 0%{?rhel}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
@ -294,6 +309,8 @@ This package contains Ceph benchmarks and test tools.
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?rhel} || 0%{?fedora}
%endif
%if 0%{?suse_version}
@ -414,6 +431,11 @@ cmake .. \
$CEPH_EXTRA_CMAKE_ARGS \
%if 0%{with ocf}
-DWITH_OCF=ON \
%endif
%if 0%{with rgw_beast}
-DWITH_RADOSGW_BEAST_FRONTEND=ON \
%else
-DWITH_RADOSGW_BEAST_FRONTEND=OFF \
%endif
-DBOOST_J=%{_smp_ncpus}
@ -504,6 +526,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/radosgw
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
%if 0%{?suse_version}
# create __pycache__ directories and their contents
@ -554,6 +577,7 @@ rm -rf %{buildroot}%{_bindir}/ceph-rbdnamer
rm -rf %{buildroot}%{_bindir}/ceph-syn
rm -rf %{buildroot}%{_bindir}/ceph-crush-location
rm -rf %{buildroot}%{_bindir}/rados
rm -rf %{buildroot}%{_bindir}/radosgw-admin
rm -rf %{buildroot}%{_bindir}/rbd
rm -rf %{buildroot}%{_bindir}/rbd-replay
rm -rf %{buildroot}%{_bindir}/rbd-replay-many
@ -573,6 +597,7 @@ rm -rf %{buildroot}%{_mandir}/man8/ceph-post-file.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph.8*
rm -rf %{buildroot}%{_mandir}/man8/mount.ceph.8*
rm -rf %{buildroot}%{_mandir}/man8/rados.8*
rm -rf %{buildroot}%{_mandir}/man8/radosgw-admin.8*
rm -rf %{buildroot}%{_mandir}/man8/rbd.8*
rm -rf %{buildroot}%{_mandir}/man8/rbdmap.8*
rm -rf %{buildroot}%{_mandir}/man8/rbd-replay.8*
@ -583,6 +608,7 @@ rm -rf %{buildroot}%{_datadir}/ceph/id_rsa_drop.ceph.com
rm -rf %{buildroot}%{_datadir}/ceph/id_rsa_drop.ceph.com.pub
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/rados
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/rbd
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/radosgw-admin
rm -rf %{buildroot}%{_sysconfdir}/ceph/rbdmap
rm -rf %{buildroot}%{_unitdir}/rbdmap.service
rm -rf %{buildroot}%{python_sitelib}/ceph_argparse.py*
@ -617,12 +643,9 @@ rm -rf %{buildroot}%{_unitdir}/ceph-rbd-mirror.target
rm -rf %{buildroot}%{_bindir}/rbd-nbd
rm -rf %{buildroot}%{_mandir}/man8/rbd-nbd.8*
rm -rf %{buildroot}%{_bindir}/radosgw
rm -rf %{buildroot}%{_bindir}/radosgw-admin
rm -rf %{buildroot}%{_bindir}/radosgw-token
rm -rf %{buildroot}%{_bindir}/radosgw-object-expirer
rm -rf %{buildroot}%{_mandir}/man8/radosgw.8*
rm -rf %{buildroot}%{_mandir}/man8/radosgw-admin.8*
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/radosgw-admin
rm -rf %{buildroot}%{_unitdir}/ceph-radosgw@.service
rm -rf %{buildroot}%{_unitdir}/ceph-radosgw.target
rm -rf %{buildroot}%{_bindir}/ceph-clsinfo
@ -705,6 +728,7 @@ rm -rf %{buildroot}%{_libdir}/libcephfs_jni.so.*
rm -rf %{buildroot}%{_libdir}/libcephfs_jni.so
rm -rf %{buildroot}%{_javadir}/libcephfs.jar
rm -rf %{buildroot}%{_javadir}/libcephfs-test.jar
rm -rf %{buildroot}%{_includedir}/rados/objclass.h
rm -rf %{buildroot}%{_datadir}/selinux/packages/ceph.pp
rm -rf %{buildroot}%{_datadir}/selinux/devel/include/contrib/ceph.if
rm -rf %{buildroot}%{_mandir}/man8/ceph_selinux.8*

View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Fri May 26 11:39:01 UTC 2017 - ncutler@suse.com
- Update to version 12.0.3+git.1495798013.23dd2b67dc:
+ ceph.spec.in: re-drop %{epoch}: prefixes
-------------------------------------------------------------------
Fri May 26 08:57:00 UTC 2017 - ncutler@suse.com
- Update to version 12.0.3+git.1495787939.3f6446f64f:
+ build/ops: rpm: adapt License line to Release 2.0 of SPDX spec
(issue#20091)
-------------------------------------------------------------------
Fri May 26 04:35:06 UTC 2017 - ncutler@suse.com
- Update to version 12.0.3+git.1495675338.07282a4057:
+ upstream 12.0.3 release
+ osd/PG: Add two new mClock implementations of the PG sharded operator queue
(pr#14997, bsc#1040103)
+ build/ops: rpm: make librbd1 %post scriptlet depend on coreutils (boo#1040230)
+ build/ops: rpm: move RDMA build dependency to distro-conditional section
+ build/ops: rpm: move python-prettytable to distro-conditional section
+ cmake: added empty RPATH to libcls_sdk.so
+ rpm: drop %{epoch} from new rados-objclass-devel subpackage
+ cmake: fix boost components for WITH_SYSTEM_BOOST
+ cmake: build boost::context only if rgw Beast frontend is in use
+ build/ops: rpm: reverse s390 bcond conditional block
+ build/ops: rpm: no rgw Beast frontend on s390x (bsc#1040119)
+ ceph.spec.in, debian/control: build/runtime dependency for cherrypy
-------------------------------------------------------------------
Wed May 10 09:00:11 UTC 2017 - ncutler@suse.com
- Update to version 12.0.2+git.1494343993.7527e4f0b8:
+ ReplicatedPG: drop CACHE_PIN->WRITESAME req translation (bsc#1038063)
-------------------------------------------------------------------
Tue May 9 09:17:19 UTC 2017 - ncutler@suse.com
- _constraints: up ceph.spec disk constraint to 28G after seeing a
build failure in OBS
-------------------------------------------------------------------
Fri Apr 28 01:22:07 UTC 2017 - ddiss@suse.com
- Update to version 12.0.2+git.1493341348.9148e53:
+ ceph osd: add support for new op cmpext
+ ceph_test_rados_api_misc: add cmpext tests
+ librados: add cmpext API
+ ceph_test_rados_api_aio: add cmpext tests
+ test/librados/c_operations: add cmpext tests
This patchset is a straight cherry-pick of the upstream OSD/librados cmpext
changes (bsc#1035937).
-------------------------------------------------------------------
Thu Apr 27 11:39:24 UTC 2017 - ncutler@suse.com

View File

@ -22,11 +22,12 @@
%endif
%bcond_with make_check
%bcond_with xio
%ifnarch s390 s390x
%bcond_without tcmalloc
%else
# no gperftools/tcmalloc on s390(x)
%ifarch s390 s390x
%bcond_with tcmalloc
%bcond_with rgw_beast
%else
%bcond_without tcmalloc
%bcond_without rgw_beast
%endif
%bcond_without lowmem_builder
%bcond_with minimal_debugging_information
@ -69,10 +70,10 @@
# main package definition
#################################################################################
Name: ceph
Version: 12.0.2+git.1493295295.8c88dc6
Release: 0
Version: 12.0.3+git.1495798013.23dd2b67dc
Release: 0%{?dist}
Summary: User space components of the Ceph file system
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0 WITH Autoconf-exception-2.0 and BSD-3-Clause and MIT
%if 0%{?suse_version}
Group: System/Filesystems
%endif
@ -110,7 +111,7 @@ BuildRequires: fuse-devel
BuildRequires: gcc-c++
BuildRequires: gdbm
%if 0%{with tcmalloc}
BuildRequires: gperftools-devel
BuildRequires: gperftools-devel >= 2.4
%endif
BuildRequires: jq
BuildRequires: leveldb-devel > 1.2
@ -130,7 +131,6 @@ BuildRequires: python
BuildRequires: python-devel
BuildRequires: python-nose
BuildRequires: python-requests
BuildRequires: python-sphinx
BuildRequires: python-virtualenv
BuildRequires: snappy-devel
BuildRequires: udev
@ -140,7 +140,6 @@ BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet
BuildRequires: yasm
BuildRequires: libibverbs-devel
#################################################################################
# distro-conditional dependencies
@ -159,7 +158,11 @@ BuildRequires: keyutils-devel
BuildRequires: libopenssl-devel
BuildRequires: lsb-release
BuildRequires: openldap2-devel
BuildRequires: python-CherryPy
BuildRequires: python-Cython
BuildRequires: python-PrettyTable
BuildRequires: python-Sphinx
BuildRequires: rdma-core-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
Requires: systemd
@ -167,10 +170,14 @@ BuildRequires: boost-random
BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
BuildRequires: libibverbs-devel
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: redhat-lsb-core
BuildRequires: Cython
BuildRequires: python-cherrypy
BuildRequires: python-prettytable
BuildRequires: python-sphinx
%endif
# python34-... for RHEL, python3-... for all other supported distros
%if 0%{?rhel}
@ -264,6 +271,12 @@ Requires: python-rados = %{version}-%{release}
Requires: python-rbd = %{version}-%{release}
Requires: python-cephfs = %{version}-%{release}
Requires: python-rgw = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
Requires: python-prettytable
%endif
%if 0%{?suse_version}
Requires: python-PrettyTable
%endif
Requires: python-requests
%{?systemd_requires}
%if 0%{?suse_version}
@ -314,6 +327,12 @@ License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-wi
Group: System/Filesystems
%endif
Requires: ceph-base = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
Requires: python-cherrypy
%endif
%if 0%{?suse_version}
Requires: python-CherryPy
%endif
%description mgr
ceph-mgr enables python modules that provide services (such as the REST
@ -551,6 +570,9 @@ Group: System/Libraries
%endif
License: LGPL-2.0
Requires: librados2 = %{version}-%{release}
%if 0%{?suse_version}
Requires(post): coreutils
%endif
%if 0%{?rhel} || 0%{?fedora}
Obsoletes: ceph-libs < %{version}-%{release}
%endif
@ -727,6 +749,15 @@ This package contains the Java libraries for the Ceph File System.
%endif
%package -n rados-objclass-devel
Summary: RADOS object class development kit
Group: Development/Libraries
License: LGPL-2.0
Requires: librados2-devel = %{version}-%{release}
%description -n rados-objclass-devel
This package contains libraries and headers needed to develop RADOS object
class plugins.
%if 0%{with selinux}
%package selinux
@ -846,6 +877,11 @@ cmake .. \
$CEPH_EXTRA_CMAKE_ARGS \
%if 0%{with ocf}
-DWITH_OCF=ON \
%endif
%if 0%{with rgw_beast}
-DWITH_RADOSGW_BEAST_FRONTEND=ON \
%else
-DWITH_RADOSGW_BEAST_FRONTEND=OFF \
%endif
-DBOOST_J=%{_smp_ncpus}
@ -936,6 +972,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/radosgw
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
%if 0%{?suse_version}
# create __pycache__ directories and their contents
@ -1010,6 +1047,7 @@ rm -rf %{buildroot}
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mds
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rgw
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mgr
%post base
/sbin/ldconfig
@ -1053,6 +1091,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
%{_bindir}/ceph-syn
%{_bindir}/ceph-crush-location
%{_bindir}/rados
%{_bindir}/radosgw-admin
%{_bindir}/rbd
%{_bindir}/rbd-replay
%{_bindir}/rbd-replay-many
@ -1076,6 +1115,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
%{_mandir}/man8/ceph.8*
%{_mandir}/man8/mount.ceph.8*
%{_mandir}/man8/rados.8*
%{_mandir}/man8/radosgw-admin.8*
%{_mandir}/man8/rbd.8*
%{_mandir}/man8/rbdmap.8*
%{_mandir}/man8/rbd-replay.8*
@ -1088,6 +1128,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
%dir %{_sysconfdir}/ceph/
%config %{_sysconfdir}/bash_completion.d/rados
%config %{_sysconfdir}/bash_completion.d/rbd
%config %{_sysconfdir}/bash_completion.d/radosgw-admin
%config(noreplace) %{_sysconfdir}/ceph/rbdmap
%{_unitdir}/rbdmap.service
%{python_sitelib}/ceph_argparse.py*
@ -1353,12 +1394,9 @@ fi
%files radosgw
%defattr(-,root,root,-)
%{_bindir}/radosgw
%{_bindir}/radosgw-admin
%{_bindir}/radosgw-token
%{_bindir}/radosgw-object-expirer
%{_mandir}/man8/radosgw.8*
%{_mandir}/man8/radosgw-admin.8*
%config %{_sysconfdir}/bash_completion.d/radosgw-admin
%dir %{_localstatedir}/lib/ceph/radosgw
%{_unitdir}/ceph-radosgw@.service
%{_unitdir}/ceph-radosgw.target
@ -1690,6 +1728,11 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
%{_javadir}/libcephfs-test.jar
%endif
%files -n rados-objclass-devel
%defattr(-,root,root,-)
%dir %{_includedir}/rados
%{_includedir}/rados/objclass.h
%if 0%{with selinux}
%files selinux
%defattr(-,root,root,-)