rpms
/
ceph
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New release (1:0.94.7-2) 

- Workaround xfs.h check
This commit is contained in:
Boris Ranto 2016-05-16 20:56:12 +02:00
parent 8c6c0bc84b
commit 373a4fde21
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0005-Workaround-xfs.h-check.patch Normal file
View File

@ -0,0 +1,36 @@
From d02ac8fd60e692da2257a1d963279091ef47e312 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Mon, 16 May 2016 20:53:28 +0200
Subject: [PATCH] Workaround xfs.h check
The check for <xfs/xfs.h> in fedora 23 is broken. See e.g.:
http://www.spinics.net/lists/ceph-devel/msg29467.html
This should not be too critical and the package should build just fine
anyway. Commenting out the bits that check for xfs.h should help us,
here.
Signed-off-by: Boris Ranto <branto@redhat.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index d1f98aa..e068fdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -814,8 +814,8 @@ AC_ARG_WITH([libxfs],
[with_libxfs=yes])
AS_IF([test "x$with_libxfs" != "xno"], [
# xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
- AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
- [xfs/xfs.h not found (--without-libxfs to disable)]))
+ #AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
+ # [xfs/xfs.h not found (--without-libxfs to disable)]))
AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h])
AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [
#include <xfs/xfs.h>
--
2.5.5

8
ceph.spec
View File

@ -12,7 +12,7 @@
#################################################################################
Name: ceph
Version: 0.94.7
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 1
Summary: User space components of the Ceph file system
License: GPLv2
@ -23,6 +23,7 @@ Patch1: 0001-Disable-erasure_codelib-neon-build.patch
Patch2: 0002-init-ceph.in-Allow-custom-cluster-names-during-start.patch
Patch3: 0003-Apply-ceph-0.94.1-tcmalloc.patch.patch
Patch4: 0004-Apply-init-ceph.in-fedora.patch.patch
Patch5: 0005-Workaround-xfs.h-check.patch
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
%endif
# fix build without tcmalloc
@ -430,6 +431,7 @@ python-cephfs instead.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
%endif
@ -935,6 +937,10 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
# actually build this meta package.
%changelog
* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:0.94.7-2
- New release (1:0.94.7-2)
- Workaround xfs.h check
* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:0.94.7-1
- New version (1:0.94.7-1)
- Disable erasure_codelib neon build