Accepting request 514586 from filesystems:ceph:luminous
bsc#1043399 OBS-URL: https://build.opensuse.org/request/show/514586 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=115
This commit is contained in:
parent
ac4381f052
commit
f0e70cf7ee
2
_service
2
_service
@ -6,7 +6,7 @@
|
|||||||
<param name="filename">ceph</param>
|
<param name="filename">ceph</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="package-meta">no</param>
|
<param name="package-meta">no</param>
|
||||||
<param name="changesgenerate">enable</param>
|
<param name="changesgenerate">disable</param>
|
||||||
<param name="commandtorun">sh etc/ceph_ver_hack.sh</param>
|
<param name="commandtorun">sh etc/ceph_ver_hack.sh</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="extract_ceph_spec" mode="disabled" />
|
<service name="extract_ceph_spec" mode="disabled" />
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:58bae7e0568ba4e02d984cccf8c174c4a8beb51573339c050a0977370ce7053e
|
|
||||||
size 127319462
|
|
3
ceph-12.1.2+git.1501865907.88dc8cdc9d.tar.bz2
Normal file
3
ceph-12.1.2+git.1501865907.88dc8cdc9d.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:320679b70a5cbd85669554bce5e7c8b6fcb26d66345e25c68a4be26147e6ba0b
|
||||||
|
size 127311258
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Thu Aug 03 20:06:55 UTC 2017 - ncutler@suse.com
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@
|
|||||||
# main package definition
|
# main package definition
|
||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph-test
|
Name: ceph-test
|
||||||
Version: 12.1.2+git.1501790037.82d6a9c37a
|
Version: 12.1.2+git.1501865907.88dc8cdc9d
|
||||||
Release: 0%{?dist}
|
Release: 0%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
@ -188,7 +188,7 @@ BuildRequires: python-PrettyTable
|
|||||||
BuildRequires: python-Sphinx
|
BuildRequires: python-Sphinx
|
||||||
BuildRequires: rdma-core-devel
|
BuildRequires: rdma-core-devel
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
|
|
||||||
BuildRequires: boost-random
|
BuildRequires: boost-random
|
||||||
BuildRequires: btrfs-progs
|
BuildRequires: btrfs-progs
|
||||||
@ -550,6 +550,8 @@ rm -rf %{buildroot}%{_bindir}/cephfs-table-tool
|
|||||||
rm -rf %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
|
rm -rf %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
|
||||||
rm -rf %{buildroot}%{_sbindir}/ceph-create-keys
|
rm -rf %{buildroot}%{_sbindir}/ceph-create-keys
|
||||||
rm -rf %{buildroot}%{_sbindir}/ceph-disk
|
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}%{_sbindir}/rcceph
|
||||||
rm -rf %{buildroot}%{_libexecdir}/ceph/ceph_common.sh
|
rm -rf %{buildroot}%{_libexecdir}/ceph/ceph_common.sh
|
||||||
rm -rf %{buildroot}%{_libdir}/rados-classes/*
|
rm -rf %{buildroot}%{_libdir}/rados-classes/*
|
||||||
@ -564,9 +566,11 @@ 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-mon
|
||||||
rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
|
rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
|
||||||
rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service
|
rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service
|
||||||
|
rm -rf %{buildroot}%{_unitdir}/ceph-volume@.service
|
||||||
rm -rf %{buildroot}%{_unitdir}/ceph.target
|
rm -rf %{buildroot}%{_unitdir}/ceph.target
|
||||||
rm -rf %{buildroot}%{python_sitelib}/ceph_detect_init*
|
rm -rf %{buildroot}%{python_sitelib}/ceph_detect_init*
|
||||||
rm -rf %{buildroot}%{python_sitelib}/ceph_disk*
|
rm -rf %{buildroot}%{python_sitelib}/ceph_disk*
|
||||||
|
rm -rf %{buildroot}%{python_sitelib}/ceph_volume*
|
||||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-deploy.8*
|
rm -rf %{buildroot}%{_mandir}/man8/ceph-deploy.8*
|
||||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-detect-init.8*
|
rm -rf %{buildroot}%{_mandir}/man8/ceph-detect-init.8*
|
||||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-create-keys.8*
|
rm -rf %{buildroot}%{_mandir}/man8/ceph-create-keys.8*
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Thu Aug 03 20:06:55 UTC 2017 - ncutler@suse.com
|
||||||
|
|
||||||
|
14
ceph.spec
14
ceph.spec
@ -12,7 +12,7 @@
|
|||||||
# This file is under the GNU Lesser General Public License, version 2.1
|
# This file is under the GNU Lesser General Public License, version 2.1
|
||||||
#
|
#
|
||||||
# Please submit bugfixes or comments via http://tracker.ceph.com/
|
# Please submit bugfixes or comments via http://tracker.ceph.com/
|
||||||
#
|
#
|
||||||
%bcond_without ocf
|
%bcond_without ocf
|
||||||
%bcond_with cephfs_java
|
%bcond_with cephfs_java
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -68,7 +68,7 @@
|
|||||||
# main package definition
|
# main package definition
|
||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph
|
Name: ceph
|
||||||
Version: 12.1.2+git.1501790037.82d6a9c37a
|
Version: 12.1.2+git.1501865907.88dc8cdc9d
|
||||||
Release: 0%{?dist}
|
Release: 0%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
@ -181,7 +181,7 @@ BuildRequires: python-PrettyTable
|
|||||||
BuildRequires: python-Sphinx
|
BuildRequires: python-Sphinx
|
||||||
BuildRequires: rdma-core-devel
|
BuildRequires: rdma-core-devel
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
BuildRequires: boost-random
|
BuildRequires: boost-random
|
||||||
BuildRequires: btrfs-progs
|
BuildRequires: btrfs-progs
|
||||||
@ -982,6 +982,8 @@ rm -rf %{buildroot}
|
|||||||
%{_libexecdir}/systemd/system-preset/50-ceph.preset
|
%{_libexecdir}/systemd/system-preset/50-ceph.preset
|
||||||
%{_sbindir}/ceph-create-keys
|
%{_sbindir}/ceph-create-keys
|
||||||
%{_sbindir}/ceph-disk
|
%{_sbindir}/ceph-disk
|
||||||
|
%{_sbindir}/ceph-volume
|
||||||
|
%{_sbindir}/ceph-volume-systemd
|
||||||
%{_sbindir}/rcceph
|
%{_sbindir}/rcceph
|
||||||
%dir %{_libexecdir}/ceph
|
%dir %{_libexecdir}/ceph
|
||||||
%{_libexecdir}/ceph/ceph_common.sh
|
%{_libexecdir}/ceph/ceph_common.sh
|
||||||
@ -1010,9 +1012,11 @@ rm -rf %{buildroot}
|
|||||||
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
|
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
|
||||||
%endif
|
%endif
|
||||||
%{_unitdir}/ceph-disk@.service
|
%{_unitdir}/ceph-disk@.service
|
||||||
|
%{_unitdir}/ceph-volume@.service
|
||||||
%{_unitdir}/ceph.target
|
%{_unitdir}/ceph.target
|
||||||
%{python_sitelib}/ceph_detect_init*
|
%{python_sitelib}/ceph_detect_init*
|
||||||
%{python_sitelib}/ceph_disk*
|
%{python_sitelib}/ceph_disk*
|
||||||
|
%{python_sitelib}/ceph_volume*
|
||||||
%{_mandir}/man8/ceph-deploy.8*
|
%{_mandir}/man8/ceph-deploy.8*
|
||||||
%{_mandir}/man8/ceph-detect-init.8*
|
%{_mandir}/man8/ceph-detect-init.8*
|
||||||
%{_mandir}/man8/ceph-create-keys.8*
|
%{_mandir}/man8/ceph-create-keys.8*
|
||||||
@ -1038,6 +1042,7 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
%systemd_post ceph-disk@\*.service ceph.target
|
%systemd_post ceph-disk@\*.service ceph.target
|
||||||
|
%systemd_post ceph-volume@\*.service ceph.target
|
||||||
%endif
|
%endif
|
||||||
if [ $1 -eq 1 ] ; then
|
if [ $1 -eq 1 ] ; then
|
||||||
/usr/bin/systemctl start ceph.target >/dev/null 2>&1 || :
|
/usr/bin/systemctl start ceph.target >/dev/null 2>&1 || :
|
||||||
@ -1049,6 +1054,7 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
%systemd_preun ceph-disk@\*.service ceph.target
|
%systemd_preun ceph-disk@\*.service ceph.target
|
||||||
|
%systemd_preun ceph-volume@\*.service ceph.target
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%postun base
|
%postun base
|
||||||
@ -1069,7 +1075,7 @@ if [ $FIRST_ARG -ge 1 ] ; then
|
|||||||
source $SYSCONF_CEPH
|
source $SYSCONF_CEPH
|
||||||
fi
|
fi
|
||||||
if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
|
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user