pyrox.dev
ceph: 0.79 -> 0.85
+42
pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch
+42
pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch
···
···
1
+
From 2507ab33236f0da12899fbcdd36535f7c7b68a06 Mon Sep 17 00:00:00 2001
2
+
From: "William A. Kennington III" <william@wkennington.com>
3
+
Date: Sat, 20 Sep 2014 22:52:31 -0700
4
+
Subject: [PATCH] Cleanup boost optionals
5
+
6
+
---
7
+
src/osd/ECBackend.cc | 2 +-
8
+
src/osd/ReplicatedPG.cc | 5 ++++-
9
+
2 files changed, 5 insertions(+), 2 deletions(-)
10
+
11
+
diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
12
+
index a87b5b4..c386900 100644
13
+
--- a/src/osd/ECBackend.cc
14
+
+++ b/src/osd/ECBackend.cc
15
+
@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs)
16
+
lhs << "read_result_t(r=" << rhs.r
17
+
<< ", errors=" << rhs.errors;
18
+
if (rhs.attrs) {
19
+
- lhs << ", attrs=" << rhs.attrs;
20
+
+ lhs << ", attrs=" << rhs.attrs.get();
21
+
} else {
22
+
lhs << ", noattrs";
23
+
}
24
+
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
25
+
index 5e5510d..79e8616 100644
26
+
--- a/src/osd/ReplicatedPG.cc
27
+
+++ b/src/osd/ReplicatedPG.cc
28
+
@@ -5259,7 +5259,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
29
+
for (list<OpContext::NotifyAck>::iterator p = ctx->notify_acks.begin();
30
+
p != ctx->notify_acks.end();
31
+
++p) {
32
+
- dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl;
33
+
+ if (p->watch_cookie)
34
+
+ dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl;
35
+
+ else
36
+
+ dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl;
37
+
for (map<pair<uint64_t, entity_name_t>, WatchRef>::iterator i =
38
+
ctx->obc->watchers.begin();
39
+
i != ctx->obc->watchers.end();
40
+
--
41
+
2.1.0
42
+
+25
pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch
+25
pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch
···
···
1
+
From 34c27f66210570adf5aba624d7da3c0382d5493f Mon Sep 17 00:00:00 2001
2
+
From: "William A. Kennington III" <william@wkennington.com>
3
+
Date: Sun, 21 Sep 2014 12:19:30 -0700
4
+
Subject: [PATCH] Makefile-env: Don't force /sbin
5
+
6
+
---
7
+
src/Makefile-env.am | 2 +-
8
+
1 file changed, 1 insertion(+), 1 deletion(-)
9
+
10
+
diff --git a/src/Makefile-env.am b/src/Makefile-env.am
11
+
index f2ab655..bf8876e 100644
12
+
--- a/src/Makefile-env.am
13
+
+++ b/src/Makefile-env.am
14
+
@@ -27,7 +27,7 @@ bin_DEBUGPROGRAMS =
15
+
ceph_sbindir = $(sbindir)
16
+
17
+
# certain things go straight into /sbin, though!
18
+
-su_sbindir = /sbin
19
+
+su_sbindir = $(sbindir)
20
+
21
+
# C/C++ tests to build will be appended to this
22
+
check_PROGRAMS =
23
+
--
24
+
2.1.0
25
+
+40
-22
pkgs/tools/filesystems/ceph/default.nix
+40
-22
pkgs/tools/filesystems/ceph/default.nix
···
1
-
{stdenv, fetchgit, libatomic_ops, autoconf, automake, boost, btrfsProgs, cryptopp, curl, expat,
2
-
fcgi, fuse, gperftools, keyutils, leveldb, libaio, libedit, libtool,
3
-
libuuid, linuxHeaders, openssl, pkgconfig, python, snappy, which, xfsprogs, xz}:
4
5
stdenv.mkDerivation rec {
6
-
baseName="ceph";
7
-
version="0.79";
8
-
name="${baseName}-${version}";
9
buildInputs = [
10
-
fuse linuxHeaders pkgconfig libatomic_ops autoconf automake boost btrfsProgs cryptopp expat
11
-
fcgi fuse gperftools keyutils leveldb libaio libedit libtool libuuid openssl pkgconfig
12
-
python snappy which xfsprogs.lib xz
13
];
14
15
preConfigure = ''
16
./autogen.sh
17
'';
18
19
-
installFlags = "DESTDIR=\${out}";
20
21
enableParallelBuilding = true;
22
-
src = fetchgit {
23
-
url = "https://github.com/ceph/ceph";
24
-
rev = "4c2d73a5095f527c3a2168deb5fa54b3c8991a6e";
25
-
sha256 = "0850m817wqqmw2qdnwm5jvbdgifzlc7kcd05jv526pdvmq1x92rf";
26
-
};
27
28
-
meta = {
29
-
inherit version;
30
description = "Distributed storage system";
31
-
maintainers = [
32
-
stdenv.lib.maintainers.ak
33
-
];
34
-
platforms = with stdenv.lib.platforms;
35
-
linux;
36
};
37
}
···
1
+
{ stdenv, fetchgit, autoconf, automake, makeWrapper, pkgconfig, libtool, which
2
+
, boost, btrfsProgs, cryptopp, curl, expat, fcgi, fuse, gperftools, keyutils
3
+
, leveldb, libaio, libatomic_ops, libedit, libuuid, linuxHeaders, openssl
4
+
, python, snappy, udev, xfsprogs, xz
5
+
}:
6
7
+
let
8
+
wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $out)\""
9
+
+ " --prefix PATH : \"$out/bin\""
10
+
+ " --prefix LD_LIBRARY_PATH : \"$out/lib\"";
11
+
in
12
stdenv.mkDerivation rec {
13
+
name="ceph-${version}";
14
+
version="0.85";
15
+
16
+
src = fetchgit {
17
+
url = "git://github.com/ceph/ceph.git";
18
+
rev = "refs/tags/v0.85";
19
+
sha256 = "0g98cgrs3gfsc8azg3k0n61bgna2w906qm69j4qbjkb61l83ld1z";
20
+
};
21
+
22
+
patches = [
23
+
./0001-Cleanup-boost-optionals.patch # Remove in 0.86
24
+
./0001-Makefile-env-Don-t-force-sbin.patch
25
+
];
26
+
27
+
nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
28
buildInputs = [
29
+
boost boost.lib btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
30
+
libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
31
+
snappy udev xfsprogs.lib xz
32
];
33
34
preConfigure = ''
35
./autogen.sh
36
'';
37
38
+
configureFlags = [ "--exec_prefix=$(out)" ];
39
+
40
+
postInstall = ''
41
+
wrapProgram $out/bin/ceph ${wrapArgs}
42
+
wrapProgram $out/bin/ceph-brag ${wrapArgs}
43
+
wrapProgram $out/bin/ceph-rest-api ${wrapArgs}
44
+
'';
45
46
enableParallelBuilding = true;
47
48
+
meta = with stdenv.lib; {
49
+
homepage = http://ceph.com/;
50
description = "Distributed storage system";
51
+
license = licenses.lgpl21;
52
+
maintainers = with maintainers; [ ak wkennington ];
53
+
platforms = with platforms; linux;
54
};
55
}