pool/ceph
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 486365 from filesystems:ceph

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/486365
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=9
This commit is contained in:
Yuchen Lin 2017-04-11 07:30:18 +00:00 committed by Git OBS Bridge
commit ac6cf07478
8 changed files with 112 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -1,12 +1,12 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="versionformat">12.0.0+git.%ct.%h</param> <param name="versionformat">12.0.1+git.%ct.%h</param>
<param name="url">git://github.com/SUSE/ceph.git</param> <param name="url">git://github.com/SUSE/ceph.git</param>
<param name="revision">ses5</param> <param name="revision">ses5</param>
<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" />

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">git://github.com/SUSE/ceph.git</param> <param name="url">git://github.com/SUSE/ceph.git</param>
<param name="changesrevision">410e200be5f33c0f2079a3ad1c0cbc2464236e53</param></service></servicedata> <param name="changesrevision">165c23f778c4e87a5bb6b05d4ec4eb3795246ffa</param></service></servicedata>

3
ceph-12.0.0+git.1489159457.410e200.tar.bz2
View File

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

3
ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 Normal file
View File

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

27
ceph-test.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Apr 7 09:41:22 UTC 2017 - ncutler@suse.com
- Update to version 12.0.1+git.1491557762.4e47e9f
+ merge upstream master (2950ad91d25d0d6e2e3fb6842d5bbc36353ba2a5)
including fixes for:
* bsc#1030068 (s390 build)
* bsc#1031311 (ceph-mon.service not enabled via systemd preset)
-------------------------------------------------------------------
Tue Apr 4 13:42:40 UTC 2017 - ncutler@suse.com
- Mention bugs fixed in jewel codestream that are also fixed in the current
codestream:
+ msg/simple/Pipe: avoid returning 0 on poll timeout (bsc#1014338)
+ build/ops: fix undefined crypto references with --with-xio (bsc#977940)
+ ceph-create-keys: add missing argument comma (bsc#1008894)
+ common: Improve linux dcache hash algorithm (bsc#1005179)
-------------------------------------------------------------------
Tue Mar 14 12:09:01 UTC 2017 - ncutler@suse.com
- Update to version 12.0.0+git.1489432599.165c23f:
+ merge upstream master (0c2f5f7214d2410a7519f88e65ed5273d6480227)
including fix for upstream issue#18694 "ceph-disk activate for partition
failing"
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 10 15:55:53 UTC 2017 - ncutler@suse.com Fri Mar 10 15:55:53 UTC 2017 - ncutler@suse.com

29
ceph-test.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ceph # spec file for package ceph
# #
# Copyright (C) 2004-2016 The Ceph Project Developers. See COPYING file # Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file
# at the top-level directory of this distribution and at # at the top-level directory of this distribution and at
# https://github.com/ceph/ceph/blob/master/COPYING # https://github.com/ceph/ceph/blob/master/COPYING
# #
@ -13,6 +13,7 @@
# #
# Please submit bugfixes or comments via http://tracker.ceph.com/ # Please submit bugfixes or comments via http://tracker.ceph.com/
# #
%bcond_without ocf
%bcond_with cephfs_java %bcond_with cephfs_java
%if 0%{?suse_version} %if 0%{?suse_version}
%bcond_without ceph_test_package %bcond_without ceph_test_package
@ -62,12 +63,13 @@
# unify libexec for all targets # unify libexec for all targets
%global _libexecdir %{_exec_prefix}/lib %global _libexecdir %{_exec_prefix}/lib
# disable dwz which compresses the debuginfo
%global _find_debuginfo_dwz_opts %{nil}
################################################################################# #################################################################################
# common # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 12.0.0+git.1489159457.410e200 Version: 12.0.1+git.1491557762.4e47e9f
Release: 0 Release: 0
Summary: Ceph benchmarks and test tools 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 and BSD-3-Clause and MIT
@ -142,6 +144,7 @@ BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet BuildRequires: xmlstarlet
BuildRequires: yasm BuildRequires: yasm
BuildRequires: libibverbs-devel
################################################################################# #################################################################################
# distro-conditional dependencies # distro-conditional dependencies
@ -216,7 +219,7 @@ BuildRequires: libxio-devel
This package contains Ceph benchmarks and test tools. This package contains Ceph benchmarks and test tools.
################################################################################# #################################################################################
# packages # subpackages
################################################################################# #################################################################################
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
@ -360,6 +363,17 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
env | sort env | sort
%if %{with lowmem_builder}
%if 0%{?jobs} > 8
%define _smp_mflags -j8
%endif
%endif
# unlimit _smp_mflags in system macro if not set above
%define _smp_ncpus_max 0
# extract the number of processors for use with cmake
%define _smp_ncpus %(echo %{_smp_mflags} | sed 's/-j//')
mkdir build mkdir build
cd build cd build
cmake .. \ cmake .. \
@ -398,8 +412,9 @@ cmake .. \
%endif %endif
$CEPH_EXTRA_CMAKE_ARGS \ $CEPH_EXTRA_CMAKE_ARGS \
%if 0%{with ocf} %if 0%{with ocf}
-DWITH_OCF=ON -DWITH_OCF=ON \
%endif %endif
-DBOOST_J=%{_smp_ncpus}
# Parallel build settings ... # Parallel build settings ...
PARALLEL_BUILD=%{?_smp_mflags} PARALLEL_BUILD=%{?_smp_mflags}
@ -609,7 +624,7 @@ rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/radosgw-admin
rm -rf %{buildroot}%{_unitdir}/ceph-radosgw@.service rm -rf %{buildroot}%{_unitdir}/ceph-radosgw@.service
rm -rf %{buildroot}%{_unitdir}/ceph-radosgw.target rm -rf %{buildroot}%{_unitdir}/ceph-radosgw.target
rm -rf %{buildroot}%{_bindir}/ceph-clsinfo rm -rf %{buildroot}%{_bindir}/ceph-clsinfo
rm -rf %{buildroot}%{_bindir}/ceph-bluefs-tool rm -rf %{buildroot}%{_bindir}/ceph-bluestore-tool
rm -rf %{buildroot}%{_bindir}/ceph-objectstore-tool rm -rf %{buildroot}%{_bindir}/ceph-objectstore-tool
rm -rf %{buildroot}%{_bindir}/ceph-osd rm -rf %{buildroot}%{_bindir}/ceph-osd
rm -rf %{buildroot}%{_sbindir}/ceph-disk rm -rf %{buildroot}%{_sbindir}/ceph-disk

27
ceph.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Apr 7 09:41:22 UTC 2017 - ncutler@suse.com
- Update to version 12.0.1+git.1491557762.4e47e9f
+ merge upstream master (2950ad91d25d0d6e2e3fb6842d5bbc36353ba2a5)
including fixes for:
* bsc#1030068 (s390 build)
* bsc#1031311 (ceph-mon.service not enabled via systemd preset)
-------------------------------------------------------------------
Tue Apr 4 13:42:40 UTC 2017 - ncutler@suse.com
- Mention bugs fixed in jewel codestream that are also fixed in the current
codestream:
+ msg/simple/Pipe: avoid returning 0 on poll timeout (bsc#1014338)
+ build/ops: fix undefined crypto references with --with-xio (bsc#977940)
+ ceph-create-keys: add missing argument comma (bsc#1008894)
+ common: Improve linux dcache hash algorithm (bsc#1005179)
-------------------------------------------------------------------
Tue Mar 14 12:09:01 UTC 2017 - ncutler@suse.com
- Update to version 12.0.0+git.1489432599.165c23f:
+ merge upstream master (0c2f5f7214d2410a7519f88e65ed5273d6480227)
including fix for upstream issue#18694 "ceph-disk activate for partition
failing"
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 10 15:55:53 UTC 2017 - ncutler@suse.com Fri Mar 10 15:55:53 UTC 2017 - ncutler@suse.com

44
ceph.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ceph # spec file for package ceph
# #
# Copyright (C) 2004-2016 The Ceph Project Developers. See COPYING file # Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file
# at the top-level directory of this distribution and at # at the top-level directory of this distribution and at
# https://github.com/ceph/ceph/blob/master/COPYING # https://github.com/ceph/ceph/blob/master/COPYING
# #
@ -13,6 +13,7 @@
# #
# Please submit bugfixes or comments via http://tracker.ceph.com/ # Please submit bugfixes or comments via http://tracker.ceph.com/
# #
%bcond_without ocf
%bcond_with cephfs_java %bcond_with cephfs_java
%if 0%{?suse_version} %if 0%{?suse_version}
%bcond_with ceph_test_package %bcond_with ceph_test_package
@ -62,12 +63,13 @@
# unify libexec for all targets # unify libexec for all targets
%global _libexecdir %{_exec_prefix}/lib %global _libexecdir %{_exec_prefix}/lib
# disable dwz which compresses the debuginfo
%global _find_debuginfo_dwz_opts %{nil}
################################################################################# #################################################################################
# common # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 12.0.0+git.1489159457.410e200 Version: 12.0.1+git.1491557762.4e47e9f
Release: 0 Release: 0
Summary: User space components of the Ceph file system 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 and BSD-3-Clause and MIT
@ -138,6 +140,7 @@ BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet BuildRequires: xmlstarlet
BuildRequires: yasm BuildRequires: yasm
BuildRequires: libibverbs-devel
################################################################################# #################################################################################
# distro-conditional dependencies # distro-conditional dependencies
@ -214,7 +217,7 @@ on commodity hardware and delivers object, block and file system storage.
################################################################################# #################################################################################
# packages # subpackages
################################################################################# #################################################################################
%package base %package base
Summary: Ceph Base Package Summary: Ceph Base Package
@ -238,6 +241,7 @@ Requires: logrotate
Requires: util-linux Requires: util-linux
Requires: cryptsetup Requires: cryptsetup
Requires: findutils Requires: findutils
Requires: psmisc
Requires: which Requires: which
%if 0%{?suse_version} %if 0%{?suse_version}
Recommends: ntp-daemon Recommends: ntp-daemon
@ -792,6 +796,17 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
env | sort env | sort
%if %{with lowmem_builder}
%if 0%{?jobs} > 8
%define _smp_mflags -j8
%endif
%endif
# unlimit _smp_mflags in system macro if not set above
%define _smp_ncpus_max 0
# extract the number of processors for use with cmake
%define _smp_ncpus %(echo %{_smp_mflags} | sed 's/-j//')
mkdir build mkdir build
cd build cd build
cmake .. \ cmake .. \
@ -830,8 +845,9 @@ cmake .. \
%endif %endif
$CEPH_EXTRA_CMAKE_ARGS \ $CEPH_EXTRA_CMAKE_ARGS \
%if 0%{with ocf} %if 0%{with ocf}
-DWITH_OCF=ON -DWITH_OCF=ON \
%endif %endif
-DBOOST_J=%{_smp_ncpus}
# Parallel build settings ... # Parallel build settings ...
PARALLEL_BUILD=%{?_smp_mflags} PARALLEL_BUILD=%{?_smp_mflags}
@ -1224,11 +1240,11 @@ fi
%post mon %post mon
%if 0%{?suse_version} %if 0%{?suse_version}
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl preset ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target >/dev/null 2>&1 || : /usr/bin/systemctl preset ceph-mon@\*.service ceph-mon.target >/dev/null 2>&1 || :
fi fi
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%systemd_post ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target %systemd_post ceph-mon@\*.service ceph-mon.target
%endif %endif
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || :
@ -1236,20 +1252,20 @@ fi
%preun mon %preun mon
%if 0%{?suse_version} %if 0%{?suse_version}
%service_del_preun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target %service_del_preun ceph-mon@\*.service ceph-mon.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%systemd_preun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target %systemd_preun ceph-mon@\*.service ceph-mon.target
%endif %endif
%postun mon %postun mon
test -n "$FIRST_ARG" || FIRST_ARG=$1 test -n "$FIRST_ARG" || FIRST_ARG=$1
%if 0%{?suse_version} %if 0%{?suse_version}
DISABLE_RESTART_ON_UPDATE="yes" DISABLE_RESTART_ON_UPDATE="yes"
%service_del_postun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target %service_del_postun ceph-mon@\*.service ceph-mon.target
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%systemd_postun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target %systemd_postun ceph-mon@\*.service ceph-mon.target
%endif %endif
if [ $FIRST_ARG -ge 1 ] ; then if [ $FIRST_ARG -ge 1 ] ; then
# Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
@ -1259,7 +1275,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-create-keys@\*.service ceph-mon@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-mon@\*.service > /dev/null 2>&1 || :
fi fi
fi fi
@ -1387,7 +1403,7 @@ fi
%files osd %files osd
%{_bindir}/ceph-clsinfo %{_bindir}/ceph-clsinfo
%{_bindir}/ceph-bluefs-tool %{_bindir}/ceph-bluestore-tool
%{_bindir}/ceph-objectstore-tool %{_bindir}/ceph-objectstore-tool
%{_bindir}/ceph-osd %{_bindir}/ceph-osd
%{_sbindir}/ceph-disk %{_sbindir}/ceph-disk