From 5fa13ad0b904c6d8195e9ac5d0869b3c373b6fc252388abcf4ca4ce667ec74d8 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 16 Apr 2018 12:34:03 +0000 Subject: [PATCH] Accepting request 597000 from filesystems:ceph:mimic 13.0.2-984 OBS-URL: https://build.opensuse.org/request/show/597000 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=181 --- ceph-13.0.2-1292-g53e40cbaae.tar.bz2 | 3 --- ceph-13.0.2-984-g852d3f1411.tar.bz2 | 3 +++ ceph-test.changes | 11 ++--------- ceph-test.spec | 14 +++++++------- ceph.changes | 11 ++--------- ceph.spec | 22 +++++++++++----------- checkin.sh | 2 ++ 7 files changed, 27 insertions(+), 39 deletions(-) delete mode 100644 ceph-13.0.2-1292-g53e40cbaae.tar.bz2 create mode 100644 ceph-13.0.2-984-g852d3f1411.tar.bz2 diff --git a/ceph-13.0.2-1292-g53e40cbaae.tar.bz2 b/ceph-13.0.2-1292-g53e40cbaae.tar.bz2 deleted file mode 100644 index f0d4a86..0000000 --- a/ceph-13.0.2-1292-g53e40cbaae.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bc0f6ac89e7afae9275961551b596b2452cb562d314ffb09fe1d66457307998 -size 71942584 diff --git a/ceph-13.0.2-984-g852d3f1411.tar.bz2 b/ceph-13.0.2-984-g852d3f1411.tar.bz2 new file mode 100644 index 0000000..2197350 --- /dev/null +++ b/ceph-13.0.2-984-g852d3f1411.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77f8176659198bd1c9a1b4b29d260156bcae6a5717725a3fb4d16b1ad7807092 +size 71153341 diff --git a/ceph-test.changes b/ceph-test.changes index fd1456e..110f9ac 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,18 +1,11 @@ -------------------------------------------------------------------- -Fri Apr 13 21:49:36 UTC 2018 - ncutler@suse.com - -- Update to 13.0.2-1292-g53e40cbaae: - + based on upstream master 4520d43ada7fb96b808c21647b9f58d9e63f91e8 - + adds new lz4 dependency for OSD - + declares existing e2fsprogs dependency for ceph-disk - ------------------------------------------------------------------- Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com -- Update to 13.0.2-980-gd814079503: +- Update to 13.0.2-984-g852d3f1411: + based on upstream master aaac83abb516f824f1caef470686b1bffeffa8b4 + fixes s390x build failure (bsc#1089291) + introduces liboath0 runtime dependency (bsc#1089302) + + fixes RGW SSL deployment ------------------------------------------------------------------- Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index fb2302f..2a03b94 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -76,7 +76,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 13.0.2.1292+g53e40cbaae +Version: 13.0.2.984+g852d3f1411 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-13.0.2-1292-g53e40cbaae.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-13.0.2-984-g852d3f1411.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -197,7 +197,6 @@ BuildRequires: python%{_python_buildid}-Cython BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: rdma-core-devel -BuildRequires: liblz4-devel >= 1.7 %endif %if 0%{?fedora} || 0%{?rhel} @@ -213,7 +212,6 @@ BuildRequires: redhat-lsb-core BuildRequires: Cython%{_python_buildid} BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx -BuildRequires: lz4-devel >= 1.7 %endif # python34-... for RHEL, python3-... for all other supported distros %if 0%{?rhel} @@ -284,8 +282,6 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{with selinux} %endif -%if 0%{?fedora} || 0%{?rhel} -%endif %if 0%{?suse_version} %endif %if 0%{?suse_version} @@ -330,6 +326,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%{?rhel} || 0%{?fedora} @@ -411,7 +411,7 @@ This package contains Ceph benchmarks and test tools. %endif %endif %prep -%autosetup -p1 -n ceph-13.0.2-1292-g53e40cbaae +%autosetup -p1 -n ceph-13.0.2-984-g852d3f1411 %build diff --git a/ceph.changes b/ceph.changes index fd1456e..110f9ac 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,18 +1,11 @@ -------------------------------------------------------------------- -Fri Apr 13 21:49:36 UTC 2018 - ncutler@suse.com - -- Update to 13.0.2-1292-g53e40cbaae: - + based on upstream master 4520d43ada7fb96b808c21647b9f58d9e63f91e8 - + adds new lz4 dependency for OSD - + declares existing e2fsprogs dependency for ceph-disk - ------------------------------------------------------------------- Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com -- Update to 13.0.2-980-gd814079503: +- Update to 13.0.2-984-g852d3f1411: + based on upstream master aaac83abb516f824f1caef470686b1bffeffa8b4 + fixes s390x build failure (bsc#1089291) + introduces liboath0 runtime dependency (bsc#1089302) + + fixes RGW SSL deployment ------------------------------------------------------------------- Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 83246e7..03c2eeb 100644 --- a/ceph.spec +++ b/ceph.spec @@ -76,7 +76,7 @@ # main package definition ################################################################################# Name: ceph -Version: 13.0.2.1292+g53e40cbaae +Version: 13.0.2.984+g852d3f1411 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-13.0.2-1292-g53e40cbaae.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-13.0.2-984-g852d3f1411.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -189,7 +189,6 @@ BuildRequires: python%{_python_buildid}-Cython BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: rdma-core-devel -BuildRequires: liblz4-devel >= 1.7 %endif %if 0%{?fedora} || 0%{?rhel} Requires: systemd @@ -205,7 +204,6 @@ BuildRequires: redhat-lsb-core BuildRequires: Cython%{_python_buildid} BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx -BuildRequires: lz4-devel >= 1.7 %endif # python34-... for RHEL, python3-... for all other supported distros %if 0%{?rhel} @@ -288,23 +286,17 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif Requires: cryptsetup -Requires: e2fsprogs Requires: findutils Requires: grep Requires: logrotate -Requires: parted Requires: psmisc Requires: python%{_python_buildid}-requests Requires: python%{_python_buildid}-setuptools Requires: util-linux Requires: xfsprogs Requires: which -%if 0%{?fedora} || 0%{?rhel} -Requires: gdisk -%endif %if 0%{?suse_version} Recommends: chrony -Requires: gptfdisk Provides: libxio = 1.7 Obsoletes: libxio <= 1.7 %endif @@ -481,6 +473,14 @@ Summary: Ceph Object Storage Daemon Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +# for sgdisk, used by ceph-disk +%if 0%{?fedora} || 0%{?rhel} +Requires: gdisk +%endif +%if 0%{?suse_version} +Requires: gptfdisk +%endif +Requires: parted Requires: lvm2 %description osd ceph-osd is the object storage daemon for the Ceph distributed file @@ -845,7 +845,7 @@ python-rbd, python-rgw or python-cephfs instead. # common ################################################################################# %prep -%autosetup -p1 -n ceph-13.0.2-1292-g53e40cbaae +%autosetup -p1 -n ceph-13.0.2-984-g852d3f1411 %build diff --git a/checkin.sh b/checkin.sh index 348b3b5..1016254 100644 --- a/checkin.sh +++ b/checkin.sh @@ -6,6 +6,8 @@ # git clone or repo+branch combination for the "ceph" package in OBS. # +set -x + BASEDIR=$(pwd) function usage {