Compare commits

...

9 Commits

Author SHA1 Message Date
Fedora Release Engineering eb28854f14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild 2017-05-15 21:04:34 +00:00
Kaleb S. KEITHLEY 0de8065f06 New release (1:10.2.7-1) 2017-04-17 13:52:12 -04:00
Boris Ranto ffa151c1c9 New release (1:10.2.5-2)
- revert to 10.2.5 for now
- include WorkQueue for librbd to avoid build errors
2017-02-09 00:08:38 +01:00
Boris Ranto f003c36523 Pack our own sources
Upstream sources are buggy, they point to a different commit in rocksdb.
2017-02-08 19:06:06 +01:00
Boris Ranto a11242cdd6 Fix Source location and extension 2017-02-07 22:32:26 +01:00
Boris Ranto 8efc832c79 Remove unnecessary patches 2017-02-07 22:27:35 +01:00
Boris Ranto 2288029bf6 New version (1:11.2.0-1)
- rebase to latest version
- sync up the spec file
2017-02-07 22:24:23 +01:00
Boris Ranto a2502bdf58 New version (1:10.2.5-1)
- hack: do not check for libxfs, assume it is present
2017-01-13 01:20:14 +01:00
Boris Ranto 7fc18b8c1c New version (1:10.2.4-2) This syncs up with the upstream 10.2.5 Doing it this way because of broken lookaside cache Fix the -devel obsoletes 2016-12-14 00:13:54 +01:00
4 changed files with 88 additions and 9 deletions
@@ -0,0 +1,33 @@
From 69e888fa5c103588ee9f23ac4cec4bfc2285eb08 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Fri, 13 Jan 2017 01:15:42 +0100
Subject: [PATCH] hack: do not test for libxfs, assume it is present
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 32e273f..050e754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -882,7 +882,7 @@ AC_ARG_WITH([libxfs],
[AS_HELP_STRING([--without-libxfs], [disable libxfs use by FileStore])],
[],
[with_libxfs=yes])
-AS_IF([test "x$with_libxfs" != "xno"], [
+AS_IF([test "x$with_libxfs" = "hack..."], [
# 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)]))
@@ -900,6 +900,7 @@ AS_IF([test "x$with_libxfs" != "xno"], [
AC_MSG_ERROR([XFS_XFLAG_EXTSIZE not found (--without-libxfs to disable)])
])
])
+AC_DEFINE([HAVE_LIBXFS], [1], [Define to 1 if you have libxfs])
AM_CONDITIONAL(WITH_LIBXFS, [test "x$with_libxfs" != "xno"])
# use libzfs
--
2.7.4
@@ -0,0 +1,25 @@
From b204da4e28a0238547c99ee1bf4080ae4d62ad33 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Wed, 8 Feb 2017 22:38:12 +0100
Subject: [PATCH] librbd/Journal: include WorkQueue since we use it
Signed-off-by: Boris Ranto <branto@redhat.com>
---
src/librbd/Journal.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/librbd/Journal.h b/src/librbd/Journal.h
index 4b70b99..2490975 100644
--- a/src/librbd/Journal.h
+++ b/src/librbd/Journal.h
@@ -11,6 +11,7 @@
#include "common/Cond.h"
#include "common/Mutex.h"
#include "common/Cond.h"
+#include "common/WorkQueue.h"
#include "journal/Future.h"
#include "journal/JournalMetadataListener.h"
#include "journal/ReplayEntry.h"
--
2.9.3
+29 -8
View File
@@ -56,8 +56,8 @@
# common
#################################################################################
Name: ceph
Version: 10.2.4
Release: 1%{?dist}
Version: 10.2.7
Release: 2%{?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
@@ -67,6 +67,8 @@ 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-hack-do-not-test-for-libxfs-assume-it-is-present.patch
Patch3: 0003-librbd-Journal-include-WorkQueue-since-we-use-it.patch
%if 0%{?suse_version}
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
@@ -383,7 +385,7 @@ License: LGPL-2.0
Requires: librados2 = %{epoch}:%{version}-%{release}
Obsoletes: ceph-devel < %{epoch}:%{version}-%{release}
Provides: librados2-devel = %{epoch}:%{version}-%{release}
Obsoletes: librados2-devel = %{epoch}:%{version}-%{release}
Obsoletes: librados2-devel < %{epoch}:%{version}-%{release}
%description -n librados-devel
This package contains libraries and headers needed to develop programs
that use RADOS object store.
@@ -403,7 +405,7 @@ Group: Development/Libraries
License: LGPL-2.0
Requires: librados2 = %{epoch}:%{version}-%{release}
Provides: librgw2-devel = %{epoch}:%{version}-%{release}
Obsoletes: librgw2-devel = %{epoch}:%{version}-%{release}
Obsoletes: librgw2-devel < %{epoch}:%{version}-%{release}
%description -n librgw-devel
This package contains libraries and headers needed to develop programs
that use RADOS gateway client library.
@@ -436,7 +438,7 @@ Requires: libradosstriper1 = %{epoch}:%{version}-%{release}
Requires: librados-devel = %{epoch}:%{version}-%{release}
Obsoletes: ceph-devel < %{epoch}:%{version}-%{release}
Provides: libradosstriper1-devel = %{epoch}:%{version}-%{release}
Obsoletes: libradosstriper1-devel = %{epoch}:%{version}-%{release}
Obsoletes: libradosstriper1-devel < %{epoch}:%{version}-%{release}
%description -n libradosstriper-devel
This package contains libraries and headers needed to develop programs
that use RADOS striping interface.
@@ -463,7 +465,7 @@ Requires: librbd1 = %{epoch}:%{version}-%{release}
Requires: librados-devel = %{epoch}:%{version}-%{release}
Obsoletes: ceph-devel < %{epoch}:%{version}-%{release}
Provides: librbd1-devel = %{epoch}:%{version}-%{release}
Obsoletes: librbd1-devel = %{epoch}:%{version}-%{release}
Obsoletes: librbd1-devel < %{epoch}:%{version}-%{release}
%description -n librbd-devel
This package contains libraries and headers needed to develop programs
that use RADOS block device.
@@ -501,7 +503,7 @@ Requires: libcephfs1 = %{epoch}:%{version}-%{release}
Requires: librados-devel = %{epoch}:%{version}-%{release}
Obsoletes: ceph-devel < %{epoch}:%{version}-%{release}
Provides: libcephfs1-devel = %{epoch}:%{version}-%{release}
Obsoletes: libcephfs1-devel = %{epoch}:%{version}-%{release}
Obsoletes: libcephfs1-devel < %{epoch}:%{version}-%{release}
%description -n libcephfs-devel
This package contains libraries and headers needed to develop programs
that use Cephs distributed file system.
@@ -546,7 +548,7 @@ Requires: java
Requires: libcephfs_jni1 = %{epoch}:%{version}-%{release}
Obsoletes: ceph-devel < %{epoch}:%{version}-%{release}
Provides: libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
Obsoletes: libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
Obsoletes: libcephfs_jni1-devel < %{epoch}:%{version}-%{release}
%description -n libcephfs_jni-devel
This package contains the development files for CephFS Java Native Interface
library.
@@ -1551,6 +1553,25 @@ exit 0
%changelog
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
* Mon Apr 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:10.2.7-2
- New release (1:10.2.7-1)
* Wed Feb 08 2017 Boris Ranto <branto@redhat.com> - 1:10.2.5-2
- New release (1:10.2.5-2)
* Fri Jan 13 2017 Boris Ranto <branto@redhat.com> - 1:10.2.5-1
- New release (1:10.2.5-1)
- hack: do not test for libxfs, assume it is present
* Wed Dec 14 2016 Boris Ranto <branto@redhat.com> - 1:10.2.4-2
- New version (1:10.2.4-2)
- This syncs up with the upstream 10.2.5
- Doing it this way because of broken lookaside cache
- Fix the -devel obsoletes
* Thu Dec 08 2016 Boris Ranto <branto@redhat.com> - 1:10.2.4-1
- New version (1:10.2.4-1)
- Disable erasure_codelib neon build
+1 -1
View File
@@ -1 +1 @@
ae84a14d93d0b7cc4fa59bac0c79746f ceph-10.2.4.tar.gz
SHA512 (ceph-10.2.7.tar.gz) = 7e0686e9efa4ddd9d548f4145b448f8232f1ca29b08428daa5cd60a74ce26f1176a1f2ebbf2ac1761d9e6c1d364a5ffa194d2b3a18a8111f59b7c27f7a1d7734