SHA256
1
0
forked from pool/ceph

Accepting request 591639 from home:Andreas_Schwab:Factory

- Reduce constraints on aarch64

OBS-URL: https://build.opensuse.org/request/show/591639
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=174
This commit is contained in:
Nathan Cutler 2018-04-12 02:10:10 +00:00 committed by Git OBS Bridge
parent 57cf7c568c
commit eed611b6e3
5 changed files with 479 additions and 419 deletions

View File

@ -31,4 +31,19 @@
</hardware> </hardware>
</overwrite> </overwrite>
<overwrite>
<conditions>
<arch>aarch64</arch>
<package>ceph-test</package>
</conditions>
<hardware>
<disk>
<size unit="G">28</size>
</disk>
<memory>
<size unit="G">8</size>
</memory>
</hardware>
</overwrite>
</constraints> </constraints>

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de
- Reduce constraints on aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com

View File

@ -1,18 +1,24 @@
# #
# spec file for package ceph # spec file for package ceph-test
# #
# Copyright (c) 2018 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/
# #
%bcond_without ocf %bcond_without ocf
%bcond_with make_check %bcond_with make_check
%ifarch s390 s390x %ifarch s390 s390x
@ -75,194 +81,190 @@
################################################################################# #################################################################################
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 13.0.1.3204+g17e0216271 Version: 13.0.1.3204+g17e0216271
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
Group: System/Filesystems
%if 0%{?suse_version} %if 0%{?suse_version}
Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3204-g17e0216271.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3204-g17e0216271.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
Source98: README-ceph-test.txt Source98: README-ceph-test.txt
Source99: ceph-rpmlintrc Source99: ceph-rpmlintrc
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
%else %else
ExclusiveArch: x86_64 aarch64 ppc64le ExclusiveArch: x86_64 aarch64 ppc64le
%endif %endif
%endif %endif
################################################################################# #################################################################################
# dependencies that apply across all distro families # dependencies that apply across all distro families
################################################################################# #################################################################################
Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
Requires: jq
Requires: socat
Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: xmlstarlet
Requires: xmlstarlet
Requires: jq
Requires: socat
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: bc BuildRequires: bc
BuildRequires: gperf
BuildRequires: cmake BuildRequires: cmake
BuildRequires: cryptsetup BuildRequires: cryptsetup
BuildRequires: fuse-devel BuildRequires: fuse-devel
BuildRequires: gperf
%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++ BuildRequires: devtoolset-7-gcc-c++
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif %endif
BuildRequires: gdbm BuildRequires: gdbm
%if 0%{with tcmalloc} %if 0%{with tcmalloc}
BuildRequires: gperftools-devel >= 2.4 BuildRequires: gperftools-devel >= 2.4
%endif %endif
BuildRequires: jq BuildRequires: jq
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: libtool
BuildRequires: libtool BuildRequires: libudev-devel
BuildRequires: libxml2-devel BuildRequires: libuuid-devel
BuildRequires: libuuid-devel BuildRequires: libxml2-devel
BuildRequires: make BuildRequires: make
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: python%{_python_buildid}-nose BuildRequires: python%{_python_buildid}-nose
BuildRequires: python%{_python_buildid}-requests BuildRequires: python%{_python_buildid}-requests
BuildRequires: python%{_python_buildid}-virtualenv BuildRequires: python%{_python_buildid}-virtualenv
BuildRequires: snappy-devel BuildRequires: snappy-devel
%if 0%{with make_check} %if 0%{with make_check}
BuildRequires: socat BuildRequires: socat
%endif %endif
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
################################################################################# #################################################################################
# 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: libbz2-devel
BuildRequires: btrfsprogs BuildRequires: btrfsprogs
BuildRequires: mozilla-nss-devel BuildRequires: cunit-devel
BuildRequires: keyutils-devel BuildRequires: keyutils-devel
BuildRequires: libbz2-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: cunit-devel BuildRequires: python%{_python_buildid}-Cython
BuildRequires: python%{_python_buildid}-base BuildRequires: python%{_python_buildid}-PrettyTable
BuildRequires: python%{_python_buildid}-Cython BuildRequires: python%{_python_buildid}-Sphinx
BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-base
BuildRequires: python%{_python_buildid}-Sphinx
BuildRequires: rdma-core-devel BuildRequires: rdma-core-devel
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: CUnit-devel
BuildRequires: Cython%{_python_buildid}
BuildRequires: boost-random BuildRequires: boost-random
BuildRequires: btrfs-progs BuildRequires: btrfs-progs
BuildRequires: nss-devel BuildRequires: keyutils-libs-devel
BuildRequires: keyutils-libs-devel BuildRequires: libibverbs-devel
BuildRequires: libibverbs-devel BuildRequires: nss-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: CUnit-devel BuildRequires: python%{_python_buildid}-prettytable
BuildRequires: python%{_python_buildid}-sphinx
BuildRequires: redhat-lsb-core BuildRequires: redhat-lsb-core
BuildRequires: Cython%{_python_buildid}
BuildRequires: python%{_python_buildid}-prettytable
BuildRequires: python%{_python_buildid}-sphinx
%endif %endif
# python34-... for RHEL, python3-... for all other supported distros # python34-... for RHEL, python3-... for all other supported distros
%if 0%{?rhel} %if 0%{?rhel}
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
# 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}-pecan BuildRequires: python%{_python_buildid}-coverage
BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-tox BuildRequires: python%{_python_buildid}-tox
BuildRequires: python%{_python_buildid}-coverage BuildRequires: python%{_python_buildid}-werkzeug
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: python%{_python_buildid}-bcrypt
%endif %endif
%if 0%{?rhel} %if 0%{?rhel}
BuildRequires: py-bcrypt BuildRequires: py-bcrypt
%endif %endif
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-CherryPy
BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-bcrypt
BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-coverage
BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: python%{_python_buildid}-numpy-devel
BuildRequires: python%{_python_buildid}-tox BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-coverage BuildRequires: python%{_python_buildid}-tox
%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}
@ -510,7 +512,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
@ -518,7 +519,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
@ -972,5 +972,6 @@ rm -rf %{buildroot}
%endif # with selinux %endif # with selinux
%if 0%{with python2} %if 0%{with python2}
%endif %endif
%changelog
# nospeccleaner # nospeccleaner
%changelog

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de
- Reduce constraints on aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com

640
ceph.spec

File diff suppressed because it is too large Load Diff