diff --git a/ceph-13.0.1-3023-g71b0480e48.tar.bz2 b/ceph-13.0.1-3023-g71b0480e48.tar.bz2 deleted file mode 100644 index 926debd..0000000 --- a/ceph-13.0.1-3023-g71b0480e48.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3090f0e647b0c3d62a691752863f2b10de048537509d3f2a38a684216159b92b -size 68267448 diff --git a/ceph-13.0.1-3203-g482167bd29.tar.bz2 b/ceph-13.0.1-3203-g482167bd29.tar.bz2 new file mode 100644 index 0000000..f5239da --- /dev/null +++ b/ceph-13.0.1-3203-g482167bd29.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a6b117fe0bb9c5508c0966a0ebbfc6b66fc9da532832e62451db6280faa3009 +size 67598826 diff --git a/ceph-test.changes b/ceph-test.changes index a232992..f86d5d4 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -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 diff --git a/ceph-test.spec b/ceph-test.spec index 93c3bf1..a351536 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -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 diff --git a/ceph.changes b/ceph.changes index a232992..f86d5d4 100644 --- a/ceph.changes +++ b/ceph.changes @@ -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 diff --git a/ceph.spec b/ceph.spec index 3c06778..fcb0ac1 100644 --- a/ceph.spec +++ b/ceph.spec @@ -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 diff --git a/checkin.sh b/checkin.sh index d88adbb..348b3b5 100644 --- a/checkin.sh +++ b/checkin.sh @@ -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"