SHA256
1
0
forked from pool/ceph

Accepting request 681313 from filesystems:ceph:nautilus

fix ceph-mgr-diskprediction-local runtime deps

OBS-URL: https://build.opensuse.org/request/show/681313
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=210
This commit is contained in:
Nathan Cutler 2019-03-04 11:50:56 +00:00 committed by Git OBS Bridge
parent b3b96aae70
commit dde985eba7
7 changed files with 539 additions and 475 deletions

View File

@ -12,7 +12,7 @@
<size unit="G">28</size> <size unit="G">28</size>
</disk> </disk>
<memory> <memory>
<size unit="M">8500</size> <size unit="M">9000</size>
</memory> </memory>
</hardware> </hardware>
</overwrite> </overwrite>

View File

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

View File

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

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Mar 4 11:49:18 UTC 2019 - ncutler@suse.com
- Edge ceph package memory constraint upward to address "virtual memory
exhausted: Cannot allocate memory" build failure sseen in OBS
-------------------------------------------------------------------
Fri Mar 1 14:51:10 UTC 2019 - ncutler@suse.com
- Update to 14.1.0-559-gf1a72cff25:
+ rebase on top of upstream master branch, SHA1 34f04be35bb9abcb5860b4c975b105adacc7a3aa
* fix GCC-9 build (bsc#1121395)
+ SUSE branding for Ceph Dashboard (Sebastian Krah)
+ spec:
* Drop use of $FIRST_ARG (Franck Bui)
* fix ceph-mgr-diskprediction-local runtime deps
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 24 10:39:14 UTC 2019 - ncutler@suse.com Sun Feb 24 10:39:14 UTC 2019 - ncutler@suse.com

View File

@ -1,25 +1,24 @@
# #
# spec file for package ceph # spec file for package ceph
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (C) 2004-2017 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
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
# upon. # upon. The license for this file, and modifications and additions to the
# # file, is the same license as for the pristine package itself (unless the
# This file is under the GNU Lesser General Public License, version 2.1 # license for the pristine package is not an Open Source License, in which
# # case the license is the MIT License). An "Open Source License" is a
# Please submit bugfixes or comments via http://tracker.ceph.com/ # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
#################################################################################
# conditional build section
#
# please read http://rpm.org/user_doc/conditional_builds.html for explanation of
# bcond syntax!
#################################################################################
%bcond_without ocf %bcond_without ocf
%bcond_with make_check %bcond_with make_check
%ifarch s390 s390x %ifarch s390 s390x
@ -97,23 +96,22 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 14.1.0.402+ga396e8bf3b Version: 14.1.0.559+gf1a72cff25
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif %endif
# define _epoch_prefix macro which will expand to the empty string if epoch is # define _epoch_prefix macro which will expand to the empty string if epoch is
# undefined # undefined
%global _epoch_prefix %{?epoch:%{epoch}:} %global _epoch_prefix %{?epoch:}
Summary: Ceph benchmarks and test tools Summary: Ceph benchmarks and test tools
License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT License: LGPL-2.1-only AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND BSD-3-Clause AND MIT
%if 0%{?suse_version}
Group: System/Filesystems Group: System/Filesystems
%if 0%{?suse_version}
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-14.1.0-402-ga396e8bf3b.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-14.1.0-559-gf1a72cff25.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -130,89 +128,88 @@ ExclusiveArch: x86_64 aarch64 ppc64le
Requires: ceph-common Requires: ceph-common
Requires: xmlstarlet
Requires: jq Requires: jq
Requires: socat Requires: socat
Requires: xmlstarlet
Requires(post): binutils Requires(post): binutils
%if 0%{with cephfs_java} %if 0%{with cephfs_java}
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: sharutils BuildRequires: sharutils
%endif %endif
%if 0%{with selinux} %if 0%{with selinux}
BuildRequires: checkpolicy BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel BuildRequires: selinux-policy-devel
%endif %endif
BuildRequires: gperf BuildRequires: gperf
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
BuildRequires: cmake3 > 3.5 BuildRequires: cmake3 > 3.5
%else %else
BuildRequires: cmake > 3.5 BuildRequires: cmake > 3.5
%endif %endif
BuildRequires: cryptsetup BuildRequires: cryptsetup
BuildRequires: fuse-devel BuildRequires: fuse-devel
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
# devtoolset offers newer make and valgrind-devel, but the old ones are good # devtoolset offers newer make and valgrind-devel, but the old ones are good
# enough. # enough.
BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13 BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif %endif
BuildRequires: gdbm BuildRequires: gdbm
%if 0%{with tcmalloc} %if 0%{with tcmalloc}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: gperftools-devel >= 2.6.1 BuildRequires: gperftools-devel >= 2.6.1
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: gperftools-devel >= 2.4 BuildRequires: gperftools-devel >= 2.4
%endif %endif
%endif %endif
BuildRequires: leveldb-devel > 1.2 BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17 BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libudev-devel BuildRequires: liboath-devel
BuildRequires: liboath-devel BuildRequires: libtool
BuildRequires: libtool BuildRequires: libudev-devel
BuildRequires: libxml2-devel BuildRequires: libuuid-devel
BuildRequires: libuuid-devel BuildRequires: libxml2-devel
BuildRequires: make BuildRequires: make
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: parted BuildRequires: parted
BuildRequires: perl BuildRequires: perl
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: procps BuildRequires: procps
BuildRequires: python%{_python_buildid} BuildRequires: python%{_python_buildid}
BuildRequires: python%{_python_buildid}-devel BuildRequires: python%{_python_buildid}-devel
BuildRequires: snappy-devel BuildRequires: snappy-devel
BuildRequires: sudo BuildRequires: sudo
BuildRequires: udev BuildRequires: udev
BuildRequires: util-linux BuildRequires: util-linux
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
BuildRequires: which BuildRequires: which
BuildRequires: xfsprogs BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet BuildRequires: xmlstarlet
BuildRequires: yasm BuildRequires: yasm
%if 0%{with amqp_endpoint} %if 0%{with amqp_endpoint}
BuildRequires: librabbitmq-devel BuildRequires: librabbitmq-devel
%endif %endif
%if 0%{with make_check} %if 0%{with make_check}
BuildRequires: jq BuildRequires: jq
BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: python%{_python_buildid}-bcrypt
BuildRequires: python%{_python_buildid}-coverage BuildRequires: python%{_python_buildid}-coverage
BuildRequires: python%{_python_buildid}-nose BuildRequires: python%{_python_buildid}-nose
BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-requests BuildRequires: python%{_python_buildid}-requests
BuildRequires: python%{_python_buildid}-six BuildRequires: python%{_python_buildid}-six
BuildRequires: python%{_python_buildid}-tox BuildRequires: python%{_python_buildid}-tox
BuildRequires: python%{_python_buildid}-virtualenv BuildRequires: python%{_python_buildid}-virtualenv
%if 0%{?fedora} || 0%{?rhel} %if 0%{?rhel} == 7
BuildRequires: pyOpenSSL%{_python_buildid} BuildRequires: pyOpenSSL%{_python_buildid}
%endif %else
%if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-pyOpenSSL BuildRequires: python%{_python_buildid}-pyOpenSSL
%endif %endif
BuildRequires: socat BuildRequires: socat
%endif %endif
%if 0%{with seastar} %if 0%{with seastar}
BuildRequires: c-ares-devel BuildRequires: c-ares-devel
@ -229,88 +226,88 @@ BuildRequires: yaml-cpp-devel
# distro-conditional dependencies # distro-conditional dependencies
################################################################################# #################################################################################
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: systemd
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: systemd-rpm-macros
BuildRequires: systemd
%{?systemd_requires} %{?systemd_requires}
PreReq: %fillup_prereq PreReq: %fillup_prereq
BuildRequires: net-tools BuildRequires: keyutils-devel
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
BuildRequires: mozilla-nss-devel
BuildRequires: keyutils-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: lsb-release BuildRequires: lsb-release
BuildRequires: mozilla-nss-devel
BuildRequires: net-tools
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
#BuildRequires: krb5 #BuildRequires: krb5
#BuildRequires: krb5-devel #BuildRequires: krb5-devel
BuildRequires: cunit-devel BuildRequires: cunit-devel
BuildRequires: python%{_python_buildid}-setuptools BuildRequires: liblz4-devel >= 1.7
BuildRequires: python%{_python_buildid}-Cython BuildRequires: python%{_python_buildid}-Cython
BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-PrettyTable
BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: python%{_python_buildid}-Sphinx
BuildRequires: python%{_python_buildid}-setuptools
BuildRequires: rdma-core-devel BuildRequires: rdma-core-devel
BuildRequires: liblz4-devel >= 1.7
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: boost-random BuildRequires: boost-random
BuildRequires: nss-devel BuildRequires: keyutils-libs-devel
BuildRequires: keyutils-libs-devel BuildRequires: libibverbs-devel
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel BuildRequires: librdmacm-devel
BuildRequires: nss-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
#BuildRequires: krb5-devel #BuildRequires: krb5-devel
BuildRequires: openssl-devel
BuildRequires: CUnit-devel BuildRequires: CUnit-devel
BuildRequires: openssl-devel
BuildRequires: redhat-lsb-core BuildRequires: redhat-lsb-core
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
BuildRequires: Cython BuildRequires: Cython
BuildRequires: python34-devel BuildRequires: python34-Cython
BuildRequires: python34-setuptools BuildRequires: python34-devel
BuildRequires: python34-Cython BuildRequires: python34-setuptools
%else %else
BuildRequires: python3-devel BuildRequires: python3-Cython
BuildRequires: python3-setuptools BuildRequires: python3-devel
BuildRequires: python3-Cython BuildRequires: python3-setuptools
%endif %endif
BuildRequires: python%{_python_buildid}-prettytable BuildRequires: lz4-devel >= 1.7
BuildRequires: python%{_python_buildid}-sphinx BuildRequires: python%{_python_buildid}-prettytable
BuildRequires: lz4-devel >= 1.7 BuildRequires: python%{_python_buildid}-sphinx
%endif %endif
# distro-conditional make check dependencies # distro-conditional make check dependencies
%if 0%{with make_check} %if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-cherrypy
BuildRequires: python%{_python_buildid}-jwt BuildRequires: python%{_python_buildid}-jwt
BuildRequires: python%{_python_buildid}-routes BuildRequires: python%{_python_buildid}-routes
BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: python%{_python_buildid}-werkzeug
BuildRequires: xmlsec1 BuildRequires: xmlsec1
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-CherryPy
BuildRequires: python%{_python_buildid}-PyJWT BuildRequires: python%{_python_buildid}-PyJWT
BuildRequires: python%{_python_buildid}-Routes BuildRequires: python%{_python_buildid}-Routes
BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-numpy-devel
BuildRequires: xmlsec1-devel BuildRequires: xmlsec1-devel
%endif %endif
%endif %endif
# lttng and babeltrace for rbd-replay-prep # lttng and babeltrace for rbd-replay-prep
%if %{with lttng} %if %{with lttng}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: lttng-ust-devel BuildRequires: libbabeltrace-devel
BuildRequires: libbabeltrace-devel BuildRequires: lttng-ust-devel
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: lttng-ust-devel
BuildRequires: babeltrace-devel BuildRequires: babeltrace-devel
BuildRequires: lttng-ust-devel
%endif %endif
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
%endif %endif
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
BuildRequires: expat-devel BuildRequires: expat-devel
%endif %endif
#hardened-cc1 #hardened-cc1
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
@ -376,6 +373,10 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{?fedora} || 0%{?rhel}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
@ -491,7 +492,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-14.1.0-402-ga396e8bf3b %autosetup -p1 -n ceph-14.1.0-559-gf1a72cff25
%build %build
@ -609,7 +610,6 @@ ${CMAKE} .. \
make "$CEPH_MFLAGS_JOBS" make "$CEPH_MFLAGS_JOBS"
%if 0%{with make_check} %if 0%{with make_check}
%check %check
# run in-tree unittests # run in-tree unittests
@ -617,7 +617,6 @@ cd build
ctest "$CEPH_MFLAGS_JOBS" ctest "$CEPH_MFLAGS_JOBS"
%endif %endif
%install %install
pushd build pushd build
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
@ -1108,4 +1107,3 @@ rm -rf %{buildroot}
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%changelog %changelog
# nospeccleaner

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Mar 4 11:49:18 UTC 2019 - ncutler@suse.com
- Edge ceph package memory constraint upward to address "virtual memory
exhausted: Cannot allocate memory" build failure sseen in OBS
-------------------------------------------------------------------
Fri Mar 1 14:51:10 UTC 2019 - ncutler@suse.com
- Update to 14.1.0-559-gf1a72cff25:
+ rebase on top of upstream master branch, SHA1 34f04be35bb9abcb5860b4c975b105adacc7a3aa
* fix GCC-9 build (bsc#1121395)
+ SUSE branding for Ceph Dashboard (Sebastian Krah)
+ spec:
* Drop use of $FIRST_ARG (Franck Bui)
* fix ceph-mgr-diskprediction-local runtime deps
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 24 10:39:14 UTC 2019 - ncutler@suse.com Sun Feb 24 10:39:14 UTC 2019 - ncutler@suse.com

750
ceph.spec

File diff suppressed because it is too large Load Diff