rpm/ceph
SHA256
1
0
Fork 0
forked from pool/ceph
Code Pull Requests Activity

Accepting request 589020 from filesystems:ceph:mimic

Browse Source 
bsc#1081526

OBS-URL: https://build.opensuse.org/request/show/589020
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=171
This commit is contained in:
Nathan Cutler 2018-03-20 09:11:03 +00:00 committed by Git OBS Bridge
parent ae6231234e
commit b3ec65ecbd
7 changed files with 58 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-13.0.1-3023-g71b0480e48.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3090f0e647b0c3d62a691752863f2b10de048537509d3f2a38a684216159b92b
size 68267448

3
ceph-13.0.1-3203-g482167bd29.tar.bz2 Normal file
View File

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

17
ceph-test.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Mar 20 09:01:25 UTC 2018 - ncutler@suse.com
- Update to 13.0.1-3203-g482167bd29:
+ fix s390x build failure (bsc#1081526)
-------------------------------------------------------------------
Mon Mar 19 15:31:24 UTC 2018 - ncutler@suse.com
- Update to 13.0.1-3202-g7a60121a01:
+ latest master (dashboard_v2 MGR module renamed to dashboard)
-------------------------------------------------------------------
Mon Mar 19 12:49:00 UTC 2018 - ncutler@suse.com
- checkin.sh: add interactive verification of Ceph version number sanity
-------------------------------------------------------------------
Fri Mar 16 20:52:48 UTC 2018 - ncutler@suse.com

10
ceph-test.spec
View File

@ -76,7 +76,7 @@
# main package definition
#################################################################################
Name: ceph-test
Version: 13.0.1.3023+g71b0480e48
Version: 13.0.1.3203+g482167bd29
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -87,12 +87,12 @@ Epoch: 2
%global _epoch_prefix %{?epoch:%{epoch}:}
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 BSD-3-Clause and MIT
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}
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3023-g71b0480e48.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3203-g482167bd29.tar.bz2
%if 0%{?suse_version}
Source96: checkin.sh
Source97: README-checkin.txt
@ -408,7 +408,7 @@ This package contains Ceph benchmarks and test tools.
%endif
%endif
%prep
%autosetup -p1 -n ceph-13.0.1-3023-g71b0480e48
%autosetup -p1 -n ceph-13.0.1-3203-g482167bd29
%build
@ -471,7 +471,7 @@ cmake .. \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \
-DWITH_MGR_DASHBOARD_V2_FRONTEND=OFF \
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
%if %{with python2}
-DWITH_PYTHON2=ON \
%else

17
ceph.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Mar 20 09:01:25 UTC 2018 - ncutler@suse.com
- Update to 13.0.1-3203-g482167bd29:
+ fix s390x build failure (bsc#1081526)
-------------------------------------------------------------------
Mon Mar 19 15:31:24 UTC 2018 - ncutler@suse.com
- Update to 13.0.1-3202-g7a60121a01:
+ latest master (dashboard_v2 MGR module renamed to dashboard)
-------------------------------------------------------------------
Mon Mar 19 12:49:00 UTC 2018 - ncutler@suse.com
- checkin.sh: add interactive verification of Ceph version number sanity
-------------------------------------------------------------------
Fri Mar 16 20:52:48 UTC 2018 - ncutler@suse.com

10
ceph.spec
View File

@ -76,7 +76,7 @@
# main package definition
#################################################################################
Name: ceph
Version: 13.0.1.3023+g71b0480e48
Version: 13.0.1.3203+g482167bd29
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -87,12 +87,12 @@ Epoch: 2
%global _epoch_prefix %{?epoch:%{epoch}:}
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 BSD-3-Clause and MIT
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}
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3023-g71b0480e48.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3203-g482167bd29.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
%if 0%{?is_opensuse}
@ -840,7 +840,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common
#################################################################################
%prep
%autosetup -p1 -n ceph-13.0.1-3023-g71b0480e48
%autosetup -p1 -n ceph-13.0.1-3203-g482167bd29
%build
@ -903,7 +903,7 @@ cmake .. \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \
-DWITH_MGR_DASHBOARD_V2_FRONTEND=OFF \
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
%if %{with python2}
-DWITH_PYTHON2=ON \
%else

13
checkin.sh
View File

@ -43,6 +43,16 @@ function _check_ceph_clone {
fi
}
function _verify_git_describe {
git describe --match 'v*'
echo "Does this version number looks sane? y/[N]"
read a
if [ "x$a" != "xy" ] ; then
echo "Aborting!"
exit 1
fi
}
GETOPT=$(getopt -o b:e:hr: --long "branch:,existing:,help,repo:" \
-n 'checkin.sh' -- "$@")
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@ -86,14 +96,13 @@ fi
_check_ceph_clone "$CLONE"
pushd $CLONE
_verify_git_describe
if [ -z "$TMPDIR" ] ; then
echo "Deleting stale tarballs from previous runs"
rm -rf *.bz2
fi
echo "Running make-dist inside clone"
./make-dist
popd
echo "Running \"osc rm *bz2\" to nuke previous tarball"