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:
Git OBS Bridge
parent
b3b96aae70
commit
dde985eba7
@ -12,7 +12,7 @@
|
||||
<size unit="G">28</size>
|
||||
</disk>
|
||||
<memory>
|
||||
<size unit="M">8500</size>
|
||||
<size unit="M">9000</size>
|
||||
</memory>
|
||||
</hardware>
|
||||
</overwrite>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:704028e97fa4710123d85bce3d6e67c0adb4db2a40c698a45047d32d44cd8656
|
||||
size 95818578
|
||||
3
ceph-14.1.0-559-gf1a72cff25.tar.bz2
Normal file
3
ceph-14.1.0-559-gf1a72cff25.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7b317bc63e1fe86e4db0e77b6613970bd6a495f28f9b01d2e9edd2189904df81
|
||||
size 96538856
|
||||
@ -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
|
||||
|
||||
|
||||
222
ceph-test.spec
222
ceph-test.spec
@ -1,25 +1,24 @@
|
||||
#
|
||||
# spec file for package ceph
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file
|
||||
# at the top-level directory of this distribution and at
|
||||
# https://github.com/ceph/ceph/blob/master/COPYING
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon.
|
||||
#
|
||||
# This file is under the GNU Lesser General Public License, version 2.1
|
||||
#
|
||||
# Please submit bugfixes or comments via http://tracker.ceph.com/
|
||||
# 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
|
||||
# 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
|
||||
# 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_with make_check
|
||||
%ifarch s390 s390x
|
||||
@ -97,23 +96,22 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph-test
|
||||
Version: 14.1.0.402+ga396e8bf3b
|
||||
Version: 14.1.0.559+gf1a72cff25
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 2
|
||||
%endif
|
||||
|
||||
# define _epoch_prefix macro which will expand to the empty string if epoch is
|
||||
# undefined
|
||||
%global _epoch_prefix %{?epoch:%{epoch}:}
|
||||
%global _epoch_prefix %{?epoch:}
|
||||
|
||||
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
|
||||
%if 0%{?suse_version}
|
||||
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
|
||||
Group: System/Filesystems
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
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}
|
||||
Source96: checkin.sh
|
||||
Source97: README-checkin.txt
|
||||
@ -130,89 +128,88 @@ ExclusiveArch: x86_64 aarch64 ppc64le
|
||||
|
||||
|
||||
Requires: ceph-common
|
||||
Requires: xmlstarlet
|
||||
Requires: jq
|
||||
Requires: socat
|
||||
Requires: xmlstarlet
|
||||
Requires(post): binutils
|
||||
%if 0%{with cephfs_java}
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: sharutils
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: sharutils
|
||||
%endif
|
||||
%if 0%{with selinux}
|
||||
BuildRequires: checkpolicy
|
||||
BuildRequires: selinux-policy-devel
|
||||
BuildRequires: checkpolicy
|
||||
BuildRequires: selinux-policy-devel
|
||||
%endif
|
||||
BuildRequires: gperf
|
||||
BuildRequires: gperf
|
||||
%if 0%{?rhel} == 7
|
||||
BuildRequires: cmake3 > 3.5
|
||||
%else
|
||||
BuildRequires: cmake > 3.5
|
||||
%endif
|
||||
BuildRequires: cryptsetup
|
||||
BuildRequires: fuse-devel
|
||||
BuildRequires: cryptsetup
|
||||
BuildRequires: fuse-devel
|
||||
%if 0%{?rhel} == 7
|
||||
# devtoolset offers newer make and valgrind-devel, but the old ones are good
|
||||
# enough.
|
||||
BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
|
||||
BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
|
||||
%else
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-c++
|
||||
%endif
|
||||
BuildRequires: gdbm
|
||||
BuildRequires: gdbm
|
||||
%if 0%{with tcmalloc}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
BuildRequires: gperftools-devel >= 2.6.1
|
||||
BuildRequires: gperftools-devel >= 2.6.1
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: gperftools-devel >= 2.4
|
||||
BuildRequires: gperftools-devel >= 2.4
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: leveldb-devel > 1.2
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: libblkid-devel >= 2.17
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: libudev-devel
|
||||
BuildRequires: liboath-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: parted
|
||||
BuildRequires: perl
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: leveldb-devel > 1.2
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: libblkid-devel >= 2.17
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: liboath-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libudev-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: parted
|
||||
BuildRequires: perl
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: procps
|
||||
BuildRequires: python%{_python_buildid}
|
||||
BuildRequires: python%{_python_buildid}-devel
|
||||
BuildRequires: snappy-devel
|
||||
BuildRequires: sudo
|
||||
BuildRequires: udev
|
||||
BuildRequires: util-linux
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: which
|
||||
BuildRequires: xfsprogs
|
||||
BuildRequires: xfsprogs-devel
|
||||
BuildRequires: xmlstarlet
|
||||
BuildRequires: yasm
|
||||
BuildRequires: python%{_python_buildid}
|
||||
BuildRequires: python%{_python_buildid}-devel
|
||||
BuildRequires: snappy-devel
|
||||
BuildRequires: sudo
|
||||
BuildRequires: udev
|
||||
BuildRequires: util-linux
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: which
|
||||
BuildRequires: xfsprogs
|
||||
BuildRequires: xfsprogs-devel
|
||||
BuildRequires: xmlstarlet
|
||||
BuildRequires: yasm
|
||||
%if 0%{with amqp_endpoint}
|
||||
BuildRequires: librabbitmq-devel
|
||||
%endif
|
||||
%if 0%{with make_check}
|
||||
BuildRequires: jq
|
||||
BuildRequires: python%{_python_buildid}-bcrypt
|
||||
BuildRequires: python%{_python_buildid}-coverage
|
||||
BuildRequires: python%{_python_buildid}-nose
|
||||
BuildRequires: python%{_python_buildid}-pecan
|
||||
BuildRequires: python%{_python_buildid}-requests
|
||||
BuildRequires: python%{_python_buildid}-six
|
||||
BuildRequires: python%{_python_buildid}-tox
|
||||
BuildRequires: python%{_python_buildid}-virtualenv
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
BuildRequires: python%{_python_buildid}-bcrypt
|
||||
BuildRequires: python%{_python_buildid}-coverage
|
||||
BuildRequires: python%{_python_buildid}-nose
|
||||
BuildRequires: python%{_python_buildid}-pecan
|
||||
BuildRequires: python%{_python_buildid}-requests
|
||||
BuildRequires: python%{_python_buildid}-six
|
||||
BuildRequires: python%{_python_buildid}-tox
|
||||
BuildRequires: python%{_python_buildid}-virtualenv
|
||||
%if 0%{?rhel} == 7
|
||||
BuildRequires: pyOpenSSL%{_python_buildid}
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%else
|
||||
BuildRequires: python%{_python_buildid}-pyOpenSSL
|
||||
%endif
|
||||
BuildRequires: socat
|
||||
BuildRequires: socat
|
||||
%endif
|
||||
%if 0%{with seastar}
|
||||
BuildRequires: c-ares-devel
|
||||
@ -229,88 +226,88 @@ BuildRequires: yaml-cpp-devel
|
||||
# distro-conditional dependencies
|
||||
#################################################################################
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: systemd
|
||||
%{?systemd_requires}
|
||||
PreReq: %fillup_prereq
|
||||
BuildRequires: net-tools
|
||||
BuildRequires: libbz2-devel
|
||||
BuildRequires: mozilla-nss-devel
|
||||
BuildRequires: keyutils-devel
|
||||
PreReq: %fillup_prereq
|
||||
BuildRequires: keyutils-devel
|
||||
BuildRequires: libbz2-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: lsb-release
|
||||
BuildRequires: mozilla-nss-devel
|
||||
BuildRequires: net-tools
|
||||
BuildRequires: openldap2-devel
|
||||
#BuildRequires: krb5
|
||||
#BuildRequires: krb5-devel
|
||||
BuildRequires: cunit-devel
|
||||
BuildRequires: python%{_python_buildid}-setuptools
|
||||
BuildRequires: python%{_python_buildid}-Cython
|
||||
BuildRequires: python%{_python_buildid}-PrettyTable
|
||||
BuildRequires: python%{_python_buildid}-Sphinx
|
||||
BuildRequires: liblz4-devel >= 1.7
|
||||
BuildRequires: python%{_python_buildid}-Cython
|
||||
BuildRequires: python%{_python_buildid}-PrettyTable
|
||||
BuildRequires: python%{_python_buildid}-Sphinx
|
||||
BuildRequires: python%{_python_buildid}-setuptools
|
||||
BuildRequires: rdma-core-devel
|
||||
BuildRequires: liblz4-devel >= 1.7
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
|
||||
BuildRequires: boost-random
|
||||
BuildRequires: nss-devel
|
||||
BuildRequires: keyutils-libs-devel
|
||||
BuildRequires: libibverbs-devel
|
||||
BuildRequires: keyutils-libs-devel
|
||||
BuildRequires: libibverbs-devel
|
||||
BuildRequires: librdmacm-devel
|
||||
BuildRequires: nss-devel
|
||||
BuildRequires: openldap-devel
|
||||
#BuildRequires: krb5-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: CUnit-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: redhat-lsb-core
|
||||
%if 0%{?rhel} == 7
|
||||
BuildRequires: Cython
|
||||
BuildRequires: python34-devel
|
||||
BuildRequires: python34-setuptools
|
||||
BuildRequires: python34-Cython
|
||||
BuildRequires: Cython
|
||||
BuildRequires: python34-Cython
|
||||
BuildRequires: python34-devel
|
||||
BuildRequires: python34-setuptools
|
||||
%else
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-Cython
|
||||
BuildRequires: python3-Cython
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
%endif
|
||||
BuildRequires: python%{_python_buildid}-prettytable
|
||||
BuildRequires: python%{_python_buildid}-sphinx
|
||||
BuildRequires: lz4-devel >= 1.7
|
||||
BuildRequires: lz4-devel >= 1.7
|
||||
BuildRequires: python%{_python_buildid}-prettytable
|
||||
BuildRequires: python%{_python_buildid}-sphinx
|
||||
%endif
|
||||
# distro-conditional make check dependencies
|
||||
%if 0%{with make_check}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
BuildRequires: python%{_python_buildid}-cherrypy
|
||||
BuildRequires: python%{_python_buildid}-jwt
|
||||
BuildRequires: python%{_python_buildid}-routes
|
||||
BuildRequires: python%{_python_buildid}-werkzeug
|
||||
BuildRequires: python%{_python_buildid}-cherrypy
|
||||
BuildRequires: python%{_python_buildid}-jwt
|
||||
BuildRequires: python%{_python_buildid}-routes
|
||||
BuildRequires: python%{_python_buildid}-werkzeug
|
||||
BuildRequires: xmlsec1
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: python%{_python_buildid}-CherryPy
|
||||
BuildRequires: python%{_python_buildid}-PyJWT
|
||||
BuildRequires: python%{_python_buildid}-Routes
|
||||
BuildRequires: python%{_python_buildid}-Werkzeug
|
||||
BuildRequires: python%{_python_buildid}-numpy-devel
|
||||
BuildRequires: python%{_python_buildid}-CherryPy
|
||||
BuildRequires: python%{_python_buildid}-PyJWT
|
||||
BuildRequires: python%{_python_buildid}-Routes
|
||||
BuildRequires: python%{_python_buildid}-Werkzeug
|
||||
BuildRequires: python%{_python_buildid}-numpy-devel
|
||||
BuildRequires: xmlsec1-devel
|
||||
%endif
|
||||
%endif
|
||||
# lttng and babeltrace for rbd-replay-prep
|
||||
%if %{with lttng}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
BuildRequires: lttng-ust-devel
|
||||
BuildRequires: libbabeltrace-devel
|
||||
BuildRequires: libbabeltrace-devel
|
||||
BuildRequires: lttng-ust-devel
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: lttng-ust-devel
|
||||
BuildRequires: babeltrace-devel
|
||||
BuildRequires: lttng-ust-devel
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libexpat-devel
|
||||
%endif
|
||||
%if 0%{?rhel} || 0%{?fedora}
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: expat-devel
|
||||
%endif
|
||||
#hardened-cc1
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
@ -376,6 +373,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}
|
||||
@ -491,7 +492,7 @@ This package contains Ceph benchmarks and test tools.
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%prep
|
||||
%autosetup -p1 -n ceph-14.1.0-402-ga396e8bf3b
|
||||
%autosetup -p1 -n ceph-14.1.0-559-gf1a72cff25
|
||||
|
||||
%build
|
||||
|
||||
@ -609,7 +610,6 @@ ${CMAKE} .. \
|
||||
|
||||
make "$CEPH_MFLAGS_JOBS"
|
||||
|
||||
|
||||
%if 0%{with make_check}
|
||||
%check
|
||||
# run in-tree unittests
|
||||
@ -617,7 +617,6 @@ cd build
|
||||
ctest "$CEPH_MFLAGS_JOBS"
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
pushd build
|
||||
make DESTDIR=%{buildroot} install
|
||||
@ -1108,4 +1107,3 @@ rm -rf %{buildroot}
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%changelog
|
||||
# nospeccleaner
|
||||
|
||||
17
ceph.changes
17
ceph.changes
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user