diff --git a/README.packaging.txt b/README.packaging.txt new file mode 100644 index 0000000..bbfac3f --- /dev/null +++ b/README.packaging.txt @@ -0,0 +1,17 @@ +This package should use just the content of the git tree. If you need +to make changes, you have the following options: +* Make them in git and update the package from git (you can send merge + request if you don't have write access or if you want your patch to be + reviewed) +* Create a patch, add the patch to the package and let one of the + ceph packagers commit it for you + +The online repository is at: +http://github.com/SUSE/ceph + +For building the package from git run the service directly: +osc service disabledrun + +This generates a new tarball from the git branch specified in _service and +extracts ceph.spec (which is itself generated from ceph.spec.in, which is +maintained in git) from it. diff --git a/_servicedata b/_servicedata index 844f215..ed8c253 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - 97c7d51a62c56b6b3b0552515dce860da742756b \ No newline at end of file + 065598905847d138eaa6fc15451857cc64230b85 \ No newline at end of file diff --git a/ceph-10.0.2+git.1455722692.97c7d51.tar.xz b/ceph-10.0.2+git.1455722692.97c7d51.tar.xz deleted file mode 100644 index 4905a19..0000000 --- a/ceph-10.0.2+git.1455722692.97c7d51.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b0f27a5ad858ba15e3d252c82bb63393c2093e69cf1c9fa38020a34a3d934b6 -size 12053612 diff --git a/ceph-10.0.2+git.1455914104.0655989.tar.xz b/ceph-10.0.2+git.1455914104.0655989.tar.xz new file mode 100644 index 0000000..ec4aa53 --- /dev/null +++ b/ceph-10.0.2+git.1455914104.0655989.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d13596fc767b205be6989568aff5a48c5d167e51f4870c9e54995f18e827fe3 +size 11895708 diff --git a/ceph.changes b/ceph.changes index ee27a91..9e1ad84 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,8 +1,11 @@ ------------------------------------------------------------------- -Wed Feb 17 15:33:27 UTC 2016 - ncutler@suse.com +Fri Feb 19 19:05:48 UTC 2016 - ncutler@suse.com -- Update to version 10.0.2+git.1455722692.97c7d51: - + src/test/erasure-code/Makefile.am: avoid versioning shared libraries +- Update to version 10.0.2+git.1455908565.a9805ef: + + ceph.spec.in: disable make check ulimit checking + + Makefile: workaround an automake bug for "make check" + + src/yasm-wrapper: ignore parameters starting with ggc-min + + Refrain from versioning and packaging libec test plugins ------------------------------------------------------------------- Wed Feb 17 11:27:01 UTC 2016 - ncutler@suse.com @@ -35,7 +38,7 @@ Mon Feb 08 22:22:45 UTC 2016 - ncutler@suse.com + ceph.spec.in: add copyright notice + ceph.spec.in: add license declaration + ceph.spec.in: do not mention Fedora-specific patch - + ceph.spec.in: specify source as local tarball + + ceph.spec.in: add local sources (all to placate Factory checker script) - _service: switch to .xz for tarball compression (recommended by Factory) diff --git a/ceph.spec b/ceph.spec index d484d65..03025c3 100644 --- a/ceph.spec +++ b/ceph.spec @@ -67,11 +67,15 @@ restorecon -R /var/log/ceph > /dev/null 2>&1; %global _with_lttng 1 %endif +# unify libexec for all targets +%global _libexecdir %{_exec_prefix}/lib + + ################################################################################# # common ################################################################################# Name: ceph -Version: 10.0.2+git.1455722692.97c7d51 +Version: 10.0.2+git.1455914104.0655989 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 @@ -80,6 +84,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ Source0: %{name}-%{version}.tar.xz +Source99: ceph-rpmlintrc ################################################################################# # dependencies that apply across all distro families ################################################################################# @@ -316,9 +321,7 @@ managers such as Pacemaker. Summary: RADOS distributed object store client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel} || 0%{?fedora} Obsoletes: ceph-libs < %{version}-%{release} -%endif %description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster developed as part of the Ceph distributed storage system. This is a @@ -349,7 +352,6 @@ object store. Summary: RADOS striping interface Group: System Environment/Libraries License: LGPL-2.0 -Requires: librados2 = %{version}-%{release} %description -n libradosstriper1 Striping interface built on top of the rados library, allowing to stripe bigger objects onto several standard rados objects using @@ -370,10 +372,7 @@ that use RADOS striping interface. Summary: RADOS block device client library Group: System Environment/Libraries License: LGPL-2.0 -Requires: librados2 = %{version}-%{release} -%if 0%{?rhel} || 0%{?fedora} Obsoletes: ceph-libs < %{version}-%{release} -%endif %description -n librbd1 RBD is a block device striped across multiple distributed objects in RADOS, a reliable, autonomic distributed object storage cluster @@ -406,10 +405,8 @@ block device. Summary: Ceph distributed file system client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel} || 0%{?fedora} Obsoletes: ceph-libs < %{version}-%{release} Obsoletes: ceph-libcephfs -%endif %description -n libcephfs1 Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. This is a shared library @@ -586,6 +583,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` %{configure} CPPFLAGS="$java_inc" \ --prefix=/usr \ + --libexecdir=%{_libexecdir} \ --localstatedir=/var \ --sysconfdir=/etc \ %if 0%{?_with_systemd} @@ -626,7 +624,7 @@ make %{?_smp_mflags} %if 0%{with tests} %check # run in-tree unittests -make %{?_smp_mflags} check-local +make CHECK_ULIMIT=false %{?_smp_mflags} check-local %endif @@ -634,6 +632,20 @@ make %{?_smp_mflags} check-local %install make DESTDIR=$RPM_BUILD_ROOT install +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_example.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_fail_to_initialize.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_fail_to_register.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_hangs.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_missing_entry_point.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_missing_version.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_test_jerasure_generic.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_test_jerasure_neon.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_test_jerasure_sse3.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_test_jerasure_sse4.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_test_shec_generic.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_test_shec_neon.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_test_shec_sse3.so +rm -f $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/libec_test_shec_sse4.so find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' install -D src/etc-rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/ceph/rbdmap @@ -830,9 +842,9 @@ rm -rf $RPM_BUILD_ROOT %else /sbin/mount.ceph %endif -%dir %{_exec_prefix}/lib/ceph -%{_exec_prefix}/lib/ceph/ceph_common.sh -%{_exec_prefix}/lib/ceph/ceph-osd-prestart.sh +%dir %{_libexecdir}/ceph +%{_libexecdir}/ceph/ceph_common.sh +%{_libexecdir}/ceph/ceph-osd-prestart.sh %dir %{_libdir}/rados-classes %{_libdir}/rados-classes/libcls_cephfs.so* %{_libdir}/rados-classes/libcls_rbd.so* @@ -851,7 +863,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/rados-classes/libcls_journal.so* %dir %{_libdir}/ceph %dir %{_libdir}/ceph/erasure-code -%{_libdir}/ceph/erasure-code/libec_*.so* +%{_libdir}/ceph/erasure-code/libec_isa.so +%{_libdir}/ceph/erasure-code/libec_jerasure.so +%{_libdir}/ceph/erasure-code/libec_jerasure_generic.so +%{_libdir}/ceph/erasure-code/libec_jerasure_sse3.so +%{_libdir}/ceph/erasure-code/libec_jerasure_sse4.so +%{_libdir}/ceph/erasure-code/libec_lrc.so +%{_libdir}/ceph/erasure-code/libec_shec.so +%{_libdir}/ceph/erasure-code/libec_shec_generic.so +%{_libdir}/ceph/erasure-code/libec_shec_sse3.so +%{_libdir}/ceph/erasure-code/libec_shec_sse4.so %if 0%{?_with_lttng} %{_libdir}/libos_tp.so* %{_libdir}/libosd_tp.so*