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

Accepting request 451606 from filesystems:ceph:luminous

Browse Source 
- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch
  line in ceph-test.spec (rationale: ceph-test is not shipped for s390x)

- Update to version 11.1.0+git.1484745543.7b08de5:
  + Update to latest upstream master (36874c8) - significant changes:
    * cmake: Turn libcommon into a shared library (PR#12840)
    * cmake: fix rpath on shared libraries and executables (PR#12927)
  + Fix build failure in ppc64le and s390x, caused by missing
    "-momit-leaf-frame-pointer" gcc option in these architectures:
    + rocksdb: build with ppc64 (PR#12908)

- Update to version 11.1.0+git.1484659687.3472421:
  + rpm: tell openSUSE to never clean the spec file
  + Enable ppc64le and s390x builds in SLE
  + rpm: lttng only on x86_64 and aarch64

- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch
  line in ceph-test.spec (rationale: ceph-test is not shipped for s390x)

- Update to version 11.1.0+git.1484745543.7b08de5:
  + Update to latest upstream master (36874c8) - significant changes:
    * cmake: Turn libcommon into a shared library (PR#12840)
    * cmake: fix rpath on shared libraries and executables (PR#12927)
  + Fix build failure in ppc64le and s390x, caused by missing
    "-momit-leaf-frame-pointer" gcc option in these architectures:
    + rocksdb: build with ppc64 (PR#12908)

- Update to version 11.1.0+git.1484659687.3472421:
  + rpm: tell openSUSE to never clean the spec file
  + Enable ppc64le and s390x builds in SLE

OBS-URL: https://build.opensuse.org/request/show/451606
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=71
This commit is contained in:
Nathan Cutler 2017-01-20 11:29:05 +00:00 committed by Git OBS Bridge
parent 8ffe7c59c0
commit 367e95bd7f
8 changed files with 74 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_servicedata
View File

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

3
ceph-11.1.0+git.1483528076.d86680e.tar.bz2
View File

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

3
ceph-11.1.0+git.1484905510.4daa416.tar.bz2 Normal file
View File

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

25
ceph-test.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Fri Jan 20 10:18:44 UTC 2017 - ncutler@suse.com
- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch
line in ceph-test.spec (rationale: ceph-test is not shipped for s390x)
-------------------------------------------------------------------
Fri Jan 20 10:06:54 UTC 2017 - ncutler@suse.com
- Update to version 11.1.0+git.1484745543.7b08de5:
+ Update to latest upstream master (36874c8) - significant changes:
* cmake: Turn libcommon into a shared library (PR#12840)
* cmake: fix rpath on shared libraries and executables (PR#12927)
+ Fix build failure in ppc64le and s390x, caused by missing
"-momit-leaf-frame-pointer" gcc option in these architectures:
+ rocksdb: build with ppc64 (PR#12908)
-------------------------------------------------------------------
Tue Jan 17 14:14:45 UTC 2017 - ncutler@suse.com
- Update to version 11.1.0+git.1484659687.3472421:
+ rpm: tell openSUSE to never clean the spec file
+ Enable ppc64le and s390x builds in SLE
+ rpm: lttng only on x86_64 and aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 05 10:43:34 UTC 2017 - jfajerski@suse.com Thu Jan 05 10:43:34 UTC 2017 - jfajerski@suse.com

12
ceph-test.spec
View File

@ -13,7 +13,7 @@
# #
# Please submit bugfixes or comments via http://tracker.ceph.com/ # Please submit bugfixes or comments via http://tracker.ceph.com/
# #
%bcond_without cephfs_java %bcond_with cephfs_java
%if 0%{?suse_version} %if 0%{?suse_version}
%bcond_without ceph_test_package %bcond_without ceph_test_package
%else %else
@ -27,7 +27,7 @@
# no gperftools/tcmalloc on s390(x) # no gperftools/tcmalloc on s390(x)
%bcond_with tcmalloc %bcond_with tcmalloc
%endif %endif
%bcond_with lowmem_builder %bcond_without lowmem_builder
%bcond_with minimal_debugging_information %bcond_with minimal_debugging_information
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%bcond_with ocf %bcond_with ocf
@ -44,9 +44,11 @@
# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE) # LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE)
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
%ifarch x86_64 aarch64
%bcond_without lttng %bcond_without lttng
%endif %endif
%endif %endif
%endif
%if %{with selinux} %if %{with selinux}
# get selinux policy version # get selinux policy version
@ -65,7 +67,7 @@
# common # common
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 11.1.0+git.1483528076.d86680e Version: 11.1.0+git.1484905510.4daa416
Release: 0 Release: 0
Summary: Ceph benchmarks and test tools 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 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
@ -86,7 +88,7 @@ Source99: ceph-rpmlintrc
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
%else %else
ExclusiveArch: x86_64 aarch64 ExclusiveArch: x86_64 aarch64 ppc64le
%endif %endif
%endif %endif
################################################################################# #################################################################################
@ -556,6 +558,7 @@ rm -rf %{buildroot}%{_unitdir}/ceph-osd.target
rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service
rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd
rm -rf %{buildroot}%{_libdir}/librados.so.* rm -rf %{buildroot}%{_libdir}/librados.so.*
rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so
rm -rf %{buildroot}%{_libdir}/librados_tp.so.* rm -rf %{buildroot}%{_libdir}/librados_tp.so.*
rm -rf %{buildroot}%{_includedir}/rados/librados.h rm -rf %{buildroot}%{_includedir}/rados/librados.h
rm -rf %{buildroot}%{_includedir}/rados/librados.hpp rm -rf %{buildroot}%{_includedir}/rados/librados.hpp
@ -790,3 +793,4 @@ rm -rf %{buildroot}
%if 0%{with selinux} %if 0%{with selinux}
%endif # with selinux %endif # with selinux
%changelog %changelog
# nospeccleaner

25
ceph.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Fri Jan 20 10:18:44 UTC 2017 - ncutler@suse.com
- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch
line in ceph-test.spec (rationale: ceph-test is not shipped for s390x)
-------------------------------------------------------------------
Fri Jan 20 10:06:54 UTC 2017 - ncutler@suse.com
- Update to version 11.1.0+git.1484745543.7b08de5:
+ Update to latest upstream master (36874c8) - significant changes:
* cmake: Turn libcommon into a shared library (PR#12840)
* cmake: fix rpath on shared libraries and executables (PR#12927)
+ Fix build failure in ppc64le and s390x, caused by missing
"-momit-leaf-frame-pointer" gcc option in these architectures:
+ rocksdb: build with ppc64 (PR#12908)
-------------------------------------------------------------------
Tue Jan 17 14:14:45 UTC 2017 - ncutler@suse.com
- Update to version 11.1.0+git.1484659687.3472421:
+ rpm: tell openSUSE to never clean the spec file
+ Enable ppc64le and s390x builds in SLE
+ rpm: lttng only on x86_64 and aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 05 10:43:34 UTC 2017 - jfajerski@suse.com Thu Jan 05 10:43:34 UTC 2017 - jfajerski@suse.com

13
ceph.spec
View File

@ -13,7 +13,7 @@
# #
# Please submit bugfixes or comments via http://tracker.ceph.com/ # Please submit bugfixes or comments via http://tracker.ceph.com/
# #
%bcond_without cephfs_java %bcond_with cephfs_java
%if 0%{?suse_version} %if 0%{?suse_version}
%bcond_with ceph_test_package %bcond_with ceph_test_package
%else %else
@ -27,7 +27,7 @@
# no gperftools/tcmalloc on s390(x) # no gperftools/tcmalloc on s390(x)
%bcond_with tcmalloc %bcond_with tcmalloc
%endif %endif
%bcond_with lowmem_builder %bcond_without lowmem_builder
%bcond_with minimal_debugging_information %bcond_with minimal_debugging_information
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%bcond_with ocf %bcond_with ocf
@ -44,9 +44,11 @@
# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE) # LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE)
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
%ifarch x86_64 aarch64
%bcond_without lttng %bcond_without lttng
%endif %endif
%endif %endif
%endif
%if %{with selinux} %if %{with selinux}
# get selinux policy version # get selinux policy version
@ -65,7 +67,7 @@
# common # common
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 11.1.0+git.1483528076.d86680e Version: 11.1.0+git.1484905510.4daa416
Release: 0 Release: 0
Summary: User space components of the Ceph file system 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 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
@ -84,7 +86,7 @@ Source0: %{name}-%{version}.tar.bz2
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
%else %else
ExclusiveArch: x86_64 aarch64 ExclusiveArch: x86_64 aarch64 ppc64le s390x
%endif %endif
%endif %endif
################################################################################# #################################################################################
@ -1393,6 +1395,8 @@ fi
%files -n librados2 %files -n librados2
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/librados.so.* %{_libdir}/librados.so.*
%dir %{_libdir}/ceph
%{_libdir}/ceph/libceph-common.so
%if %{with lttng} %if %{with lttng}
%{_libdir}/librados_tp.so.* %{_libdir}/librados_tp.so.*
%endif %endif
@ -1691,3 +1695,4 @@ exit 0
%changelog %changelog
# nospeccleaner

3
pre_checkin.sh
View File

@ -169,6 +169,9 @@ function transform_spec_file {
"Source0:"*) "Source0:"*)
line=`echo $line | sed 's/%{name}/ceph/g'` line=`echo $line | sed 's/%{name}/ceph/g'`
;; ;;
"ExclusiveArch:"*)
line=`echo $line | sed 's/s390\S*//g'`
;;
"%autosetup -p1") "%autosetup -p1")
line="%autosetup -p1 -n ceph-%version" line="%autosetup -p1 -n ceph-%version"
;; ;;