From ec80f2f04c9d44fa3dbe668cf08c51c3b5b65439977a045550b892bef2dd4e8f Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 27 Apr 2017 15:34:40 +0000 Subject: [PATCH] Accepting request 491633 from filesystems:ceph:luminous OBS-URL: https://build.opensuse.org/request/show/491633 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=80 --- _constraints | 4 +- _service | 6 +-- _servicedata | 2 +- ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 | 3 -- ceph-12.0.2+git.1493295295.8c88dc6.tar.bz2 | 3 ++ ceph-test.changes | 44 ++++++++++++++++++++++ ceph-test.spec | 6 ++- ceph.changes | 44 ++++++++++++++++++++++ ceph.spec | 6 ++- ibs_constraints.sh | 3 ++ pre_checkin.sh | 1 + 11 files changed, 111 insertions(+), 11 deletions(-) delete mode 100644 ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 create mode 100644 ceph-12.0.2+git.1493295295.8c88dc6.tar.bz2 create mode 100644 ibs_constraints.sh diff --git a/_constraints b/_constraints index d070032..5637f91 100644 --- a/_constraints +++ b/_constraints @@ -9,10 +9,10 @@ - 19990 + 26 - 7240 + 8 diff --git a/_service b/_service index a5b730d..5d47937 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - 12.0.1+git.%ct.%h + 12.0.2+git.%ct.%h git://github.com/SUSE/ceph.git - ses5 + wip-msse ceph git no - disable + enable sh etc/ceph_ver_hack.sh diff --git a/_servicedata b/_servicedata index f63ea3b..732b1f5 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - 165c23f778c4e87a5bb6b05d4ec4eb3795246ffa + 8c88dc67b2eb6eba916fdcce5a3c3d86592a11c9 \ No newline at end of file diff --git a/ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 b/ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 deleted file mode 100644 index e9abd70..0000000 --- a/ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17efb0451aa525513fdd2291668a5fdb7db3de6892eaed1fde41ec0961d81cb1 -size 104267935 diff --git a/ceph-12.0.2+git.1493295295.8c88dc6.tar.bz2 b/ceph-12.0.2+git.1493295295.8c88dc6.tar.bz2 new file mode 100644 index 0000000..ec9e591 --- /dev/null +++ b/ceph-12.0.2+git.1493295295.8c88dc6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcabf802ec55fcd21986f54286e517a8ca1dbaa32d239f49f94b17b9fc76c212 +size 104760206 diff --git a/ceph-test.changes b/ceph-test.changes index 2cba4d7..63f8130 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu Apr 27 11:39:24 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.2+git.1493291471.adb6a43: + + rocksdb: sync with upstream (bsc#1025891) + + build/ops: cmake: explicitly disable MSSE 4.2 if not supported + +------------------------------------------------------------------- +Thu Apr 27 08:23:46 UTC 2017 - ncutler@suse.com + +- _constraints: set higher disk and memory constraints so s390x + builds don't fail + +------------------------------------------------------------------- +Wed Apr 26 20:51:56 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.2+git.1493238434.71681fd: + + cmake: added empty RPATH to libceph_crypto_isal.so + +------------------------------------------------------------------- +Wed Apr 26 18:10:40 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.2+git.1493227670.3396ca1: + + rgw: use a vector for options passed to civetweb + +------------------------------------------------------------------- +Wed Apr 26 10:10:21 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.2+git.1493192333.3305a0c + + merge upstream master (0d368d2c8544247a4aed9c71c74e77b0c6bbfb22) + including 12.0.2 development release + +------------------------------------------------------------------- +Tue Apr 25 12:39:36 UTC 2017 - ddiss@suse.com + +- revert commit a9a50f690085091bb4446095418237f9fef712c8 in preparation for + rebasing against the upstream implementation. (bsc#1035937) + +------------------------------------------------------------------- +Fri Apr 7 12:10:55 UTC 2017 - ncutler@suse.com + +- Add ibs_constraints.sh script to address s390 constraints + tweak needed in IBS + ------------------------------------------------------------------- Fri Apr 7 09:41:22 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index b789f14..3f0c937 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.0.1+git.1491557762.4e47e9f +Version: 12.0.2+git.1493295295.8c88dc6 Release: 0 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 GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT @@ -78,6 +78,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ Source0: ceph-%{version}.tar.bz2 +Source97: ibs_constraints.sh Source98: README-ceph-test.txt Source99: ceph-rpmlintrc # _insert_obs_source_lines_here @@ -527,6 +528,7 @@ rm -rf %{buildroot}%{_libexecdir}/ceph/ceph_common.sh rm -rf %{buildroot}%{_libdir}/rados-classes/* rm -rf %{buildroot}%{_libdir}/ceph/erasure-code/libec_*.so* rm -rf %{buildroot}%{_libdir}/ceph/compressor/libceph_*.so* +rm -rf %{buildroot}%{_libdir}/ceph/crypto/libceph_*.so* rm -rf %{buildroot}%{_libdir}/libos_tp.so* rm -rf %{buildroot}%{_libdir}/libosd_tp.so* rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/ceph @@ -723,6 +725,8 @@ rm -rf %{buildroot} ################################################################################# %files +%ifarch x86_64 +%endif %if %{with lttng} %endif %if 0%{?fedora} || 0%{?rhel} diff --git a/ceph.changes b/ceph.changes index 2cba4d7..63f8130 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu Apr 27 11:39:24 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.2+git.1493291471.adb6a43: + + rocksdb: sync with upstream (bsc#1025891) + + build/ops: cmake: explicitly disable MSSE 4.2 if not supported + +------------------------------------------------------------------- +Thu Apr 27 08:23:46 UTC 2017 - ncutler@suse.com + +- _constraints: set higher disk and memory constraints so s390x + builds don't fail + +------------------------------------------------------------------- +Wed Apr 26 20:51:56 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.2+git.1493238434.71681fd: + + cmake: added empty RPATH to libceph_crypto_isal.so + +------------------------------------------------------------------- +Wed Apr 26 18:10:40 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.2+git.1493227670.3396ca1: + + rgw: use a vector for options passed to civetweb + +------------------------------------------------------------------- +Wed Apr 26 10:10:21 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.2+git.1493192333.3305a0c + + merge upstream master (0d368d2c8544247a4aed9c71c74e77b0c6bbfb22) + including 12.0.2 development release + +------------------------------------------------------------------- +Tue Apr 25 12:39:36 UTC 2017 - ddiss@suse.com + +- revert commit a9a50f690085091bb4446095418237f9fef712c8 in preparation for + rebasing against the upstream implementation. (bsc#1035937) + +------------------------------------------------------------------- +Fri Apr 7 12:10:55 UTC 2017 - ncutler@suse.com + +- Add ibs_constraints.sh script to address s390 constraints + tweak needed in IBS + ------------------------------------------------------------------- Fri Apr 7 09:41:22 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 64862c3..8d5e5f7 100644 --- a/ceph.spec +++ b/ceph.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.0.1+git.1491557762.4e47e9f +Version: 12.0.2+git.1493295295.8c88dc6 Release: 0 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 GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT @@ -977,6 +977,10 @@ rm -rf %{buildroot} %{_libdir}/ceph/erasure-code/libec_*.so* %dir %{_libdir}/ceph/compressor %{_libdir}/ceph/compressor/libceph_*.so* +%ifarch x86_64 +%dir %{_libdir}/ceph/crypto +%{_libdir}/ceph/crypto/libceph_*.so* +%endif %if %{with lttng} %{_libdir}/libos_tp.so* %{_libdir}/libosd_tp.so* diff --git a/ibs_constraints.sh b/ibs_constraints.sh new file mode 100644 index 0000000..fd7d54c --- /dev/null +++ b/ibs_constraints.sh @@ -0,0 +1,3 @@ +#!/bin/bash +sed -i -e 's/19990/26/' _constraints +sed -i -e 's/7240/8/' _constraints diff --git a/pre_checkin.sh b/pre_checkin.sh index e4a2111..f3e1ef8 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -287,4 +287,5 @@ reqs=`get_package_requires $SPEC_FILE $PACKAGE` transform_spec_file $SPEC_FILE $PACKAGE "$rm_files" "$summ" "$desc" "$reqs" > $PACKAGE.spec insert_line_before "${PACKAGE}.spec" "Source99: ceph-rpmlintrc" "_insert_obs_source_lines_here" insert_line_before "${PACKAGE}.spec" "Source98: README-ceph-test.txt" "^Source99:" +insert_line_before "${PACKAGE}.spec" "Source97: ibs_constraints.sh" "^Source98:" copy_changes_file $PACKAGE