From fc25307343798b237670cbb6259549dcf4d467d4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 31 Jul 2013 17:03:16 +0100 Subject: [PATCH 1/3] re-enable tmalloc on arm now gperftools is fixed --- ceph.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ceph.spec b/ceph.spec index 6cc6cec..7787a42 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph Version: 0.61.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -14,7 +14,7 @@ Patch2: ceph-fix-sbin-target.patch BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel, BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel, # google-perftools is not available on these: -%ifnarch ppc ppc64 s390 s390x armv7hl +%ifnarch ppc ppc64 s390 s390x BuildRequires: gperftools-devel %endif BuildRequires: cryptopp-devel, libatomic_ops-static, gcc-c++ @@ -92,7 +92,7 @@ EXTRA_LDFLAGS="-lpthread" %{configure} --prefix=%{_prefix} --sbindir=%{_sbindir} \ --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir} \ -%ifarch ppc ppc64 s390 s390x armv7hl +%ifarch ppc ppc64 s390 s390x --without-tcmalloc \ %endif --with-system-leveldb --without-hadoop --with-radosgw --with-gtk2 \ @@ -262,6 +262,9 @@ fi %{_sysconfdir}/bash_completion.d/radosgw-admin %changelog +* Wed Jul 31 2013 Peter Robinson 0.61.7-2 +- re-enable tmalloc on arm now gperftools is fixed + * Mon Jul 29 2013 Josef Bacik - 0.61.7-1 - Update to 0.61.7 From f6f6a625d736c44be1776ad1e932e92a957d7f54 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 11 Sep 2013 14:15:50 +0200 Subject: [PATCH 2/3] General cleanup for Duplicate Provides, but found lots of other issues in the spec file: - let base package include all its documentation files via %doc magic, so for Fedora 20 Unversioned Docdirs no files are included accidentally - include the sample config files again (instead of just an empty docdir that has been added for #846735) - don't include librbd.so.1 also in -devel package (#1003202) - move one misplaced rados plugin from -devel into -libs package (#891993) - include missing directories in -devel and -libs packages - move librados-config into the -devel pkg where its manual page is, too - add %_isa to subpackage dependencies - don't use %defattr anymore - add V=1 to make invocation for verbose build output --- ceph.spec | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/ceph.spec b/ceph.spec index 7787a42..e92dfe0 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph Version: 0.61.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -45,7 +45,7 @@ libcephfs library for Ceph distributed network file system %package fuse Summary: Ceph fuse-based client Group: System Environment/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} BuildRequires: fuse-devel %description fuse FUSE based client for Ceph distributed network file system @@ -54,9 +54,9 @@ FUSE based client for Ceph distributed network file system Summary: Ceph headers Group: Development/Libraries License: LGPLv2 -Requires: %{name} = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-libcephfs = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libcephfs%{?_isa} = %{version}-%{release} %description devel This package contains the headers needed to develop programs that use Ceph. @@ -100,7 +100,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \ CXXFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS -fvisibility-inlines-hidden" \ LDFLAGS="$EXTRA_LDFLAGS" -make %{?_smp_mflags} +V=1 make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT @@ -108,6 +108,8 @@ 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/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf +rm -rf __tmp_docs ; mkdir __tmp_docs +mv $RPM_BUILD_ROOT%{_docdir}/ceph/* __tmp_docs install -m 0644 -D src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/tmp/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/ @@ -135,10 +137,8 @@ fi %postun libcephfs -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc README COPYING +%doc README COPYING __tmp_docs/sample* %dir %{_sysconfdir}/ceph -%dir %{_docdir}/ceph %{_bindir}/ceph %{_bindir}/cephfs %{_bindir}/ceph-conf @@ -153,7 +153,6 @@ fi %{_bindir}/ceph-mds %{_bindir}/ceph-osd %{_bindir}/ceph-rbdnamer -%{_bindir}/librados-config %{_bindir}/rados %{_bindir}/rbd %{_bindir}/ceph-debugpack @@ -204,23 +203,21 @@ fi %dir %{_localstatedir}/log/ceph/ %files libs -%defattr(-,root,root,-) %doc COPYING %{_libdir}/librados.so.* %{_libdir}/librbd.so.* -%{_libdir}/rados-classes/libcls_rbd.so.* +%dir %{_libdir}/rados-classes +%{_libdir}/rados-classes/libcls_rbd.so* %{_libdir}/rados-classes/libcls_rgw.so* %{_libdir}/rados-classes/libcls_lock* %{_libdir}/rados-classes/libcls_kvs* %{_libdir}/rados-classes/libcls_refcount* %files libcephfs -%defattr(-,root,root,-) %doc COPYING %{_libdir}/libcephfs.so.* %files fuse -%defattr(-,root,root,-) %doc COPYING %{_bindir}/ceph-fuse %{_bindir}/rbd-fuse @@ -229,13 +226,15 @@ fi %{_mandir}/man8/rbd-fuse.8* %files devel -%defattr(-,root,root,-) %doc COPYING +%dir %{_includedir}/cephfs %{_includedir}/cephfs/libcephfs.h +#%dir %{_includedir}/crush #%{_includedir}/crush/crush.h #%{_includedir}/crush/hash.h #%{_includedir}/crush/mapper.h #%{_includedir}/crush/types.h +%dir %{_includedir}/rados %{_includedir}/rados/librados.h %{_includedir}/rados/librados.hpp %{_includedir}/rados/rados_types.h @@ -244,24 +243,37 @@ fi %{_includedir}/rados/page.h %{_includedir}/rados/crc32c.h #%{_includedir}/rados/librgw.h +%dir %{_includedir}/rbd %{_includedir}/rbd/librbd.h %{_includedir}/rbd/librbd.hpp %{_includedir}/rbd/features.h %{_libdir}/libcephfs.so %{_libdir}/librados.so #%{_libdir}/librgw.so -%{_libdir}/librbd.so* -%{_libdir}/rados-classes/libcls_rbd.so +%{_libdir}/librbd.so +%{_bindir}/librados-config %{_mandir}/man8/librados-config.8* %files radosgw -%defattr(-,root,root,-) %{_bindir}/radosgw %{_bindir}/radosgw-admin %{_sysconfdir}/bash_completion.d/radosgw-admin %changelog +* Wed Sep 11 2013 Michael Schwendt - 0.61.7-3 +- let base package include all its documentation files via %%doc magic, + so for Fedora 20 Unversioned Docdirs no files are included accidentally +- include the sample config files again (instead of just an empty docdir + that has been added for #846735) +- don't include librbd.so.1 also in -devel package (#1003202) +- move one misplaced rados plugin from -devel into -libs package (#891993) +- include missing directories in -devel and -libs packages +- move librados-config into the -devel pkg where its manual page is, too +- add %%_isa to subpackage dependencies +- don't use %%defattr anymore +- add V=1 to make invocation for verbose build output + * Wed Jul 31 2013 Peter Robinson 0.61.7-2 - re-enable tmalloc on arm now gperftools is fixed From 7d8598d9d5489940b02fa6fd4ea4692c2d5071f1 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 11 Sep 2013 16:09:38 -0400 Subject: [PATCH 3/3] - update to 0.67.3 --- .gitignore | 1 + ceph-fix-sbin-target.patch | 8 ++++---- ceph.spec | 19 +++++++++++++++++-- sources | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a060933..f6b6aae 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ ceph-0.20.tar.gz /ceph-0.56.3.tar.bz2 /ceph-0.56.4.tar.bz2 /ceph-0.61.7.tar.bz2 +/ceph-0.67.3.tar.bz2 diff --git a/ceph-fix-sbin-target.patch b/ceph-fix-sbin-target.patch index 87310de..51bac02 100644 --- a/ceph-fix-sbin-target.patch +++ b/ceph-fix-sbin-target.patch @@ -1,11 +1,11 @@ -diff -up ceph-0.61.7/src/Makefile.am.fix-sbin ceph-0.61.7/src/Makefile.am ---- ceph-0.61.7/src/Makefile.am.fix-sbin 2013-07-26 11:52:56.355915758 -0400 -+++ ceph-0.61.7/src/Makefile.am 2013-07-26 11:53:09.502808374 -0400 +diff -up ceph-0.67.3/src/Makefile.am.sbin-fix ceph-0.67.3/src/Makefile.am +--- ceph-0.67.3/src/Makefile.am.sbin-fix 2013-09-11 13:46:40.061851086 -0400 ++++ ceph-0.67.3/src/Makefile.am 2013-09-11 13:46:51.531735427 -0400 @@ -28,7 +28,7 @@ bin_PROGRAMS = bin_DEBUGPROGRAMS = sbin_PROGRAMS = # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin --ceph_sbindir = $(prefix)$(sbindir) +-ceph_sbindir = $(exec_prefix)$(sbindir) +ceph_sbindir = $(sbindir) ceph_sbin_SCRIPTS = \ ceph-disk \ diff --git a/ceph.spec b/ceph.spec index e92dfe0..ec4cc9f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph -Version: 0.61.7 -Release: 3%{?dist} +Version: 0.67.3 +Release: 1%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -160,6 +160,8 @@ fi %{_bindir}/ceph-dencoder %{_bindir}/ceph_filestore_dump %{_bindir}/ceph_mon_store_converter +%{_bindir}/ceph-post-file +%{_bindir}/ceph-rest-api %{_initrddir}/ceph %{_sbindir}/mkcephfs %{_sbindir}/mount.ceph @@ -195,12 +197,18 @@ fi %{_mandir}/man8/ceph-clsinfo.8* %{_mandir}/man8/ceph-dencoder.8* %{_mandir}/man8/ceph-rbdnamer.8* +%{_mandir}/man8/ceph-rest-api.8* +%{_mandir}/man8/ceph-post-file.8* %{python_sitelib}/rados.py* %{python_sitelib}/rbd.py* %{python_sitelib}/cephfs.py* +%{python_sitelib}/ceph_argparse.py* +%{python_sitelib}/ceph_rest_api.py* %dir %{_localstatedir}/lib/ceph/ %dir %{_localstatedir}/lib/ceph/tmp/ %dir %{_localstatedir}/log/ceph/ +%{_datadir}/ceph/id_dsa_drop.ceph.com* +%{_datadir}/ceph/known_hosts_drop.ceph.com %files libs %doc COPYING @@ -212,6 +220,10 @@ fi %{_libdir}/rados-classes/libcls_lock* %{_libdir}/rados-classes/libcls_kvs* %{_libdir}/rados-classes/libcls_refcount* +%{_libdir}/rados-classes/libcls_log* +%{_libdir}/rados-classes/libcls_replica_log* +%{_libdir}/rados-classes/libcls_statelog* +%{_libdir}/rados-classes/libcls_version* %files libcephfs %doc COPYING @@ -261,6 +273,9 @@ fi %{_sysconfdir}/bash_completion.d/radosgw-admin %changelog +* Wed Sep 11 2013 Josef Bacik - 0.67.3-1 +- update to 0.67.3 + * Wed Sep 11 2013 Michael Schwendt - 0.61.7-3 - let base package include all its documentation files via %%doc magic, so for Fedora 20 Unversioned Docdirs no files are included accidentally diff --git a/sources b/sources index e50c4c6..206da35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c00b9db5a65b03448226d828e274fe2 ceph-0.61.7.tar.bz2 +1d7f697c17cb6f4233994063598d6d6f ceph-0.67.3.tar.bz2