Accepting request 517310 from filesystems:ceph
ceph.spec: provide libxio 1.7 and obsolete libxio <= 1.7 (forwarded request 517309 from smithfarm) OBS-URL: https://build.opensuse.org/request/show/517310 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=18
This commit is contained in:
Git OBS Bridge
4
_service
4
_service
@@ -1,12 +1,12 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="versionformat">12.1.2+git.%ct.%h</param>
|
||||
<param name="versionformat">12.1.4+git.%ct.%h</param>
|
||||
<param name="url">git://github.com/SUSE/ceph.git</param>
|
||||
<param name="revision">ses5</param>
|
||||
<param name="filename">ceph</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="package-meta">no</param>
|
||||
<param name="changesgenerate">disable</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="commandtorun">sh etc/ceph_ver_hack.sh</param>
|
||||
</service>
|
||||
<service name="extract_ceph_spec" mode="disabled" />
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://github.com/SUSE/ceph.git</param>
|
||||
<param name="changesrevision">04d0738487279ed967d2d0334f14950929af33e0</param></service></servicedata>
|
||||
<param name="changesrevision">155adb5253c3aaa47f418e70f23073e5acce58f3</param></service></servicedata>
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:988db2ba76ac0cdfbae8eba264b69ce9736129d4c7d85225824a38853747dc11
|
||||
size 127320510
|
||||
3
ceph-12.1.4+git.1502953626.155adb5253.tar.bz2
Normal file
3
ceph-12.1.4+git.1502953626.155adb5253.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:677196aaad17ec4d5354065389379c81c4b676961a4e64c839fb6fa4c9231ffa
|
||||
size 127205819
|
||||
@@ -1,3 +1,55 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 17 07:21:22 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.4+git.1502953626.155adb5253:
|
||||
+ ceph.spec: provide libxio 1.7 and obsolete libxio <= 1.7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 16 10:40:25 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.4+git.1502878199.4183317204:
|
||||
+ ceph.spec: obsolete libxio
|
||||
(Note to reviewer: libxio was only ever used by Ceph (for an experimental
|
||||
IB/RDMA feature), it was never submitted to Factory, and its functionality has
|
||||
been integrated into Ceph in a different form. For all practical purposes,
|
||||
libxio has been replaced by Ceph itself.)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 16 08:50:51 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.4+git.1502871088.edf82a59df:
|
||||
+ latest upstream luminous (a5f84b37668fc8e03165aaf5cbb380c78e4deba4)
|
||||
* increment upstream version number to 12.1.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 14 08:47:38 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.3+git.1502698163.45fc586a51:
|
||||
+ latest upstream luminous (6808af486d3bdce966232810004648502c967b13)
|
||||
* increment upstream version number to 12.1.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 05 06:42:53 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.2+git.1501914637.59afe41c49:
|
||||
+ spec file
|
||||
* ceph-volume added to ceph-base RPM, where it co-exists with ceph-disk
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 4 16:59:59 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.2+git.1501865907.88dc8cdc9d:
|
||||
+ latest upstream master (7350fa65d79b5f0ace427e609565f07be35cfe62)
|
||||
* os/bluestore: allow multiple DeferredBatches in flight at once
|
||||
(pr#16769, issue#20295, bsc#1043399)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 03 20:06:55 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.2+git.1501790037.82d6a9c37a:
|
||||
+ osd: move CMPEXT response munging into completion function
|
||||
(bsc#1047244)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 14:41:41 UTC 2017 - ncutler@suse.com
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph-test
|
||||
Version: 12.1.2+git.1501684697.aa6b0153ef
|
||||
Version: 12.1.4+git.1502953626.155adb5253
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 2
|
||||
@@ -188,7 +188,7 @@ BuildRequires: python-PrettyTable
|
||||
BuildRequires: python-Sphinx
|
||||
BuildRequires: rdma-core-devel
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
|
||||
BuildRequires: boost-random
|
||||
BuildRequires: btrfs-progs
|
||||
@@ -532,6 +532,7 @@ 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
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
|
||||
|
||||
%if 0%{?suse_version}
|
||||
# create __pycache__ directories and their contents
|
||||
@@ -550,6 +551,8 @@ rm -rf %{buildroot}%{_bindir}/cephfs-table-tool
|
||||
rm -rf %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
|
||||
rm -rf %{buildroot}%{_sbindir}/ceph-create-keys
|
||||
rm -rf %{buildroot}%{_sbindir}/ceph-disk
|
||||
rm -rf %{buildroot}%{_sbindir}/ceph-volume
|
||||
rm -rf %{buildroot}%{_sbindir}/ceph-volume-systemd
|
||||
rm -rf %{buildroot}%{_sbindir}/rcceph
|
||||
rm -rf %{buildroot}%{_libexecdir}/ceph/ceph_common.sh
|
||||
rm -rf %{buildroot}%{_libdir}/rados-classes/*
|
||||
@@ -564,9 +567,12 @@ rm -rf %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.*
|
||||
rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
|
||||
rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
|
||||
rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service
|
||||
rm -rf %{buildroot}%{_unitdir}/ceph-volume@.service
|
||||
rm -rf %{buildroot}%{_unitdir}/ceph.target
|
||||
rm -rf %{buildroot}%{python_sitelib}/ceph_detect_init*
|
||||
rm -rf %{buildroot}%{python_sitelib}/ceph_disk*
|
||||
rm -rf %{buildroot}%{python_sitelib}/ceph_volume/*
|
||||
rm -rf %{buildroot}%{python_sitelib}/ceph_volume-*
|
||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-deploy.8*
|
||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-detect-init.8*
|
||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-create-keys.8*
|
||||
|
||||
52
ceph.changes
52
ceph.changes
@@ -1,3 +1,55 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 17 07:21:22 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.4+git.1502953626.155adb5253:
|
||||
+ ceph.spec: provide libxio 1.7 and obsolete libxio <= 1.7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 16 10:40:25 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.4+git.1502878199.4183317204:
|
||||
+ ceph.spec: obsolete libxio
|
||||
(Note to reviewer: libxio was only ever used by Ceph (for an experimental
|
||||
IB/RDMA feature), it was never submitted to Factory, and its functionality has
|
||||
been integrated into Ceph in a different form. For all practical purposes,
|
||||
libxio has been replaced by Ceph itself.)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 16 08:50:51 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.4+git.1502871088.edf82a59df:
|
||||
+ latest upstream luminous (a5f84b37668fc8e03165aaf5cbb380c78e4deba4)
|
||||
* increment upstream version number to 12.1.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 14 08:47:38 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.3+git.1502698163.45fc586a51:
|
||||
+ latest upstream luminous (6808af486d3bdce966232810004648502c967b13)
|
||||
* increment upstream version number to 12.1.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 05 06:42:53 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.2+git.1501914637.59afe41c49:
|
||||
+ spec file
|
||||
* ceph-volume added to ceph-base RPM, where it co-exists with ceph-disk
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 4 16:59:59 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.2+git.1501865907.88dc8cdc9d:
|
||||
+ latest upstream master (7350fa65d79b5f0ace427e609565f07be35cfe62)
|
||||
* os/bluestore: allow multiple DeferredBatches in flight at once
|
||||
(pr#16769, issue#20295, bsc#1043399)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 03 20:06:55 UTC 2017 - ncutler@suse.com
|
||||
|
||||
- Update to version 12.1.2+git.1501790037.82d6a9c37a:
|
||||
+ osd: move CMPEXT response munging into completion function
|
||||
(bsc#1047244)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 14:41:41 UTC 2017 - ncutler@suse.com
|
||||
|
||||
|
||||
22
ceph.spec
22
ceph.spec
@@ -12,7 +12,7 @@
|
||||
# This file is under the GNU Lesser General Public License, version 2.1
|
||||
#
|
||||
# Please submit bugfixes or comments via http://tracker.ceph.com/
|
||||
#
|
||||
#
|
||||
%bcond_without ocf
|
||||
%bcond_with cephfs_java
|
||||
%if 0%{?suse_version}
|
||||
@@ -68,7 +68,7 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 12.1.2+git.1501684697.aa6b0153ef
|
||||
Version: 12.1.4+git.1502953626.155adb5253
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 2
|
||||
@@ -181,7 +181,7 @@ BuildRequires: python-PrettyTable
|
||||
BuildRequires: python-Sphinx
|
||||
BuildRequires: rdma-core-devel
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Requires: systemd
|
||||
BuildRequires: boost-random
|
||||
BuildRequires: btrfs-progs
|
||||
@@ -261,6 +261,8 @@ Requires: psmisc
|
||||
Requires: which
|
||||
%if 0%{?suse_version}
|
||||
Recommends: ntp-daemon
|
||||
Provides: libxio = 1.7
|
||||
Obsoletes: libxio <= 1.7
|
||||
%endif
|
||||
%description base
|
||||
Base is the package that includes all the files shared amongst ceph servers
|
||||
@@ -282,6 +284,8 @@ Requires: python-prettytable
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
Requires: python-PrettyTable
|
||||
Provides: libxio = 1.7
|
||||
Obsoletes: libxio <= 1.7
|
||||
%endif
|
||||
Requires: python-requests
|
||||
%{?systemd_requires}
|
||||
@@ -955,6 +959,7 @@ 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
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
|
||||
|
||||
%if 0%{?suse_version}
|
||||
# create __pycache__ directories and their contents
|
||||
@@ -982,6 +987,8 @@ rm -rf %{buildroot}
|
||||
%{_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
|
||||
@@ -1010,9 +1017,13 @@ 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*
|
||||
%dir %{python_sitelib}/ceph_volume
|
||||
%{python_sitelib}/ceph_volume/*
|
||||
%{python_sitelib}/ceph_volume-*
|
||||
%{_mandir}/man8/ceph-deploy.8*
|
||||
%{_mandir}/man8/ceph-detect-init.8*
|
||||
%{_mandir}/man8/ceph-create-keys.8*
|
||||
@@ -1027,6 +1038,7 @@ rm -rf %{buildroot}
|
||||
%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
|
||||
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd
|
||||
|
||||
%post base
|
||||
/sbin/ldconfig
|
||||
@@ -1038,6 +1050,7 @@ 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 || :
|
||||
@@ -1049,6 +1062,7 @@ fi
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%systemd_preun ceph-disk@\*.service ceph.target
|
||||
%systemd_preun ceph-volume@\*.service ceph.target
|
||||
%endif
|
||||
|
||||
%postun base
|
||||
@@ -1069,7 +1083,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 > /dev/null 2>&1 || :
|
||||
/usr/bin/systemctl try-restart ceph-disk@\*.service ceph-volume@\*.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user