From 8d319bc7a932603f13c2800234792e28d403962d Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Sep 29 2016 09:58:26 +0000 Subject: New version (1:10.2.3-1) - Disable erasure_codelib neon build - Sync up spec file with upstream --- diff --git a/0001-Disable-erasure_codelib-neon-build.patch b/0001-Disable-erasure_codelib-neon-build.patch index 18b99a7..6b76561 100644 --- a/0001-Disable-erasure_codelib-neon-build.patch +++ b/0001-Disable-erasure_codelib-neon-build.patch @@ -1,4 +1,4 @@ -From 1aa42ff6c1d1a216d36a742835d9037601360f76 Mon Sep 17 00:00:00 2001 +From c850a2a598fd1df4c2925e09ff3ed583a6cdc59b Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Wed, 11 Nov 2015 17:08:06 +0100 Subject: [PATCH] Disable erasure_codelib neon build diff --git a/0002-Do-not-use-momit-leaf-frame-pointer-flag.patch b/0002-Do-not-use-momit-leaf-frame-pointer-flag.patch deleted file mode 100644 index 583cfbd..0000000 --- a/0002-Do-not-use-momit-leaf-frame-pointer-flag.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 181986411c672e2ccce326e3c28b3ad450b6f99d Mon Sep 17 00:00:00 2001 -From: Boris Ranto -Date: Fri, 22 Apr 2016 15:30:22 +0200 -Subject: [PATCH] Do not use -momit-leaf-frame-pointer flag - -The -momit-leaf-frame-pointer flag that rocksdb is being built with does -not exist on armv7hl, this patch disables the flag. - -Signed-off-by: Boris Ranto ---- - src/rocksdb/Makefile | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/rocksdb/Makefile b/src/rocksdb/Makefile -index c64ea36..b3758a5 100644 ---- a/src/rocksdb/Makefile -+++ b/src/rocksdb/Makefile -@@ -84,9 +84,6 @@ endif - # compile with -O2 if debug level is not 2 - ifneq ($(DEBUG_LEVEL), 2) - OPT += -O2 -fno-omit-frame-pointer --ifneq ($(MACHINE),ppc64) # ppc64 doesn't support -momit-leaf-frame-pointer --OPT += -momit-leaf-frame-pointer --endif - endif - - # if we're compiling for release, compile without debug code (-DNDEBUG) and --- -2.7.4 - diff --git a/0003-fix-tcmalloc-handling-in-spec-file.patch b/0003-fix-tcmalloc-handling-in-spec-file.patch deleted file mode 100644 index 9f1c5fd..0000000 --- a/0003-fix-tcmalloc-handling-in-spec-file.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ff336b26b9d694a59141064ad76e652ecb090882 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Fri, 6 May 2016 13:29:03 +0200 -Subject: [PATCH] fix tcmalloc handling in spec file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- there is no gperftools/tcmalloc on s390(x) yet -- explicitly disable tcmalloc when built without - -Signed-off-by: Dan Horák ---- - ceph.spec.in | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/ceph.spec.in b/ceph.spec.in -index 3cf6307..c122fa7 100644 ---- a/ceph.spec.in -+++ b/ceph.spec.in -@@ -18,7 +18,12 @@ - %bcond_without cephfs_java - %bcond_with tests - %bcond_with xio -+%ifnarch s390 s390x - %bcond_without tcmalloc -+%else -+# no gperftools/tcmalloc on s390(x) -+%bcond_with tcmalloc -+%endif - %bcond_without libs_compat - %bcond_with lowmem_builder - %if 0%{?fedora} || 0%{?rhel} -@@ -137,7 +142,9 @@ BuildRequires: btrfs-progs - BuildRequires: nss-devel - BuildRequires: keyutils-libs-devel - BuildRequires: libatomic_ops-devel -+%if 0%{with tcmalloc} - BuildRequires: gperftools-devel -+%endif - BuildRequires: openldap-devel - BuildRequires: openssl-devel - BuildRequires: redhat-lsb-core -@@ -660,7 +667,9 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` - %endif - $CEPH_EXTRA_CONFIGURE_ARGS \ - %{?_with_ocf} \ -- %{?_with_tcmalloc} \ -+%if %{without tcmalloc} -+ --without-tcmalloc \ -+%endif - CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" - - %if %{with lowmem_builder} --- -2.7.4 - diff --git a/ceph.spec b/ceph.spec index 650c76f..27dd977 100644 --- a/ceph.spec +++ b/ceph.spec @@ -54,8 +54,8 @@ # common ################################################################################# Name: ceph -Version: 10.2.2 -Release: 4%{?dist} +Version: 10.2.3 +Release: 1%{?dist} Epoch: 1 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 @@ -65,8 +65,13 @@ Group: System/Filesystems URL: http://ceph.com/ Source0: http://ceph.com/download/%{name}-%{version}.tar.gz Patch1: 0001-Disable-erasure_codelib-neon-build.patch -Patch2: 0002-Do-not-use-momit-leaf-frame-pointer-flag.patch -Patch3: 0003-fix-tcmalloc-handling-in-spec-file.patch +%if 0%{?suse_version} +%if 0%{?is_opensuse} +ExclusiveArch: x86_64 aarch64 ppc64 ppc64le +%else +ExclusiveArch: x86_64 aarch64 +%endif +%endif ################################################################################# # dependencies that apply across all distro families ################################################################################# @@ -89,9 +94,13 @@ BuildRequires: cryptsetup BuildRequires: fuse-devel BuildRequires: gcc-c++ BuildRequires: gdbm +%if 0%{with tcmalloc} +BuildRequires: gperftools-devel +%endif BuildRequires: hdparm BuildRequires: leveldb-devel > 1.2 BuildRequires: libaio-devel +BuildRequires: libatomic_ops-devel BuildRequires: libblkid-devel >= 2.17 BuildRequires: libcurl-devel BuildRequires: libudev-devel @@ -128,13 +137,9 @@ BuildRequires: systemd PreReq: %fillup_prereq BuildRequires: net-tools BuildRequires: libbz2-devel -%if 0%{with tcmalloc} -BuildRequires: gperftools-devel -%endif BuildRequires: btrfsprogs BuildRequires: mozilla-nss-devel BuildRequires: keyutils-devel -BuildRequires: libatomic-ops-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release BuildRequires: openldap2-devel @@ -146,10 +151,6 @@ BuildRequires: boost-random BuildRequires: btrfs-progs BuildRequires: nss-devel BuildRequires: keyutils-libs-devel -BuildRequires: libatomic_ops-devel -%if 0%{with tcmalloc} -BuildRequires: gperftools-devel -%endif BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: redhat-lsb-core @@ -209,7 +210,6 @@ Requires: python-setuptools Requires: grep Requires: xfsprogs Requires: logrotate -Requires: parted Requires: util-linux Requires: hdparm Requires: cryptsetup @@ -354,6 +354,7 @@ Requires: gdisk %if 0%{?suse_version} Requires: gptfdisk %endif +Requires: parted %description osd ceph-osd is the object storage daemon for the Ceph distributed file system. It is responsible for storing objects on a local file system @@ -625,8 +626,6 @@ python-cephfs instead. %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %if 0%{with cephfs_java} @@ -696,7 +695,7 @@ make %{?_smp_mflags} %if 0%{with tests} %check # run in-tree unittests -make %{?_smp_mflags} check-local +make %{?_smp_mflags} check %endif @@ -721,17 +720,18 @@ install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/cep chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf chmod 0644 %{buildroot}%{_docdir}/ceph/sample.fetch_config -# firewall templates +# firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds +mkdir -p %{buildroot}/sbin +ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph %endif # udev rules install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules +install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules -mv %{buildroot}/sbin/mount.ceph %{buildroot}/usr/sbin/mount.ceph -mv %{buildroot}/sbin/mount.fuse.ceph %{buildroot}/usr/sbin/mount.fuse.ceph #set up placeholder directories mkdir -p %{buildroot}%{_sysconfdir}/ceph @@ -771,7 +771,6 @@ rm -rf %{buildroot} %{_libexecdir}/systemd/system-preset/50-ceph.preset %{_sbindir}/ceph-create-keys %{_sbindir}/rcceph -%{_sbindir}/mount.ceph %dir %{_libexecdir}/ceph %{_libexecdir}/ceph/ceph_common.sh %dir %{_libdir}/rados-classes @@ -806,7 +805,6 @@ rm -rf %{buildroot} %{_mandir}/man8/osdmaptool.8* %{_mandir}/man8/monmaptool.8* %{_mandir}/man8/cephfs.8* -%{_mandir}/man8/mount.ceph.8* #set up placeholder directories %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/tmp %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd @@ -862,6 +860,10 @@ DISABLE_RESTART_ON_UPDATE="yes" %{_bindir}/rbd-replay %{_bindir}/rbd-replay-many %{_bindir}/rbdmap +%{_sbindir}/mount.ceph +%if 0%{?suse_version} +/sbin/mount.ceph +%endif %if %{with lttng} %{_bindir}/rbd-replay-prep %endif @@ -875,6 +877,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %{_mandir}/man8/ceph-syn.8* %{_mandir}/man8/ceph-post-file.8* %{_mandir}/man8/ceph.8* +%{_mandir}/man8/mount.ceph.8* %{_mandir}/man8/rados.8* %{_mandir}/man8/rbd.8* %{_mandir}/man8/rbdmap.8* @@ -1161,6 +1164,7 @@ fi %{_sbindir}/ceph-disk %{_sbindir}/ceph-disk-udev %{_libexecdir}/ceph/ceph-osd-prestart.sh +%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules %{_udevrulesdir}/95-ceph-osd.rules %{_mandir}/man8/ceph-clsinfo.8* %{_mandir}/man8/ceph-disk.8* @@ -1222,10 +1226,6 @@ fi %dir %{_prefix}/lib/ocf %dir %{_prefix}/lib/ocf/resource.d %dir %{_prefix}/lib/ocf/resource.d/ceph -%exclude %{_prefix}/lib/ocf/resource.d/ceph/ceph -%exclude %{_prefix}/lib/ocf/resource.d/ceph/mds -%exclude %{_prefix}/lib/ocf/resource.d/ceph/mon -%exclude %{_prefix}/lib/ocf/resource.d/ceph/osd %{_prefix}/lib/ocf/resource.d/ceph/rbd %endif @@ -1535,6 +1535,10 @@ exit 0 %changelog +* Thu Sep 29 2016 Boris Ranto - 1:10.2.3-1 +- New version (1:10.2.3-1) +- Disable erasure_codelib neon build + * Sun Aug 07 2016 Igor Gnatenko - 1:10.2.2-4 - Rebuild for LevelDB 1.18 diff --git a/sources b/sources index ed70e23..982e258 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cba47af53b3b17002aad3c854e5405c ceph-10.2.2.tar.gz +5d660c78a211f6d53161e197729aebd2 ceph-10.2.3.tar.gz