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

Accepting request 491633 from filesystems:ceph:luminous

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/491633
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=80
This commit is contained in:
Nathan Cutler 2017-04-27 15:34:40 +00:00 committed by Git OBS Bridge
parent 58a59de4eb
commit ec80f2f04c
11 changed files with 111 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_constraints
View File

@ -9,10 +9,10 @@
</conditions>
<hardware>
<disk>
<size unit="M">19990</size>
<size unit="G">26</size>
</disk>
<memory>
<size unit="M">7240</size>
<size unit="G">8</size>
</memory>
</hardware>
</overwrite>

6
_service
View File

@ -1,12 +1,12 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="versionformat">12.0.1+git.%ct.%h</param>
<param name="versionformat">12.0.2+git.%ct.%h</param>
<param name="url">git://github.com/SUSE/ceph.git</param>
<param name="revision">ses5</param>
<param name="revision">wip-msse</param>
<param name="filename">ceph</param>
<param name="scm">git</param>
<param name="package-meta">no</param>
<param name="changesgenerate">disable</param>
<param name="changesgenerate">enable</param>
<param name="commandtorun">sh etc/ceph_ver_hack.sh</param>
</service>
<service name="extract_ceph_spec" mode="disabled" />

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/SUSE/ceph.git</param>
<param name="changesrevision">165c23f778c4e87a5bb6b05d4ec4eb3795246ffa</param></service></servicedata>
<param name="changesrevision">8c88dc67b2eb6eba916fdcce5a3c3d86592a11c9</param></service></servicedata>

3
ceph-12.0.1+git.1491557762.4e47e9f.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17efb0451aa525513fdd2291668a5fdb7db3de6892eaed1fde41ec0961d81cb1
size 104267935

3
ceph-12.0.2+git.1493295295.8c88dc6.tar.bz2 Normal file
View File

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

44
ceph-test.changes
View File

@ -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

6
ceph-test.spec
View File

@ -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}

44
ceph.changes
View File

@ -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

6
ceph.spec
View File

@ -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*

3
ibs_constraints.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/bash
sed -i -e 's/<size unit="M">19990/<size unit="G">26/' _constraints
sed -i -e 's/<size unit="M">7240/<size unit="G">8/' _constraints

1
pre_checkin.sh
View File

@ -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