* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2015-12-23 3:15 Yixun Lan
0 siblings, 0 replies; 27+ messages in thread
From: Yixun Lan @ 2015-12-23 3:15 UTC (permalink / raw
To: gentoo-commits
commit: 9522d24d730c057bc41f7665af4933b5d793dfe6
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 03:12:03 2015 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 03:14:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9522d24d
sys-cluster/ceph: restore systemd unit files for 0.94.5
Package-Manager: portage-2.2.26
sys-cluster/ceph/files/ceph-mds_at.service | 12 ++++++++++++
sys-cluster/ceph/files/ceph-mon_at.service | 19 +++++++++++++++++++
sys-cluster/ceph/files/ceph-osd_at.service | 13 +++++++++++++
3 files changed, 44 insertions(+)
diff --git a/sys-cluster/ceph/files/ceph-mds_at.service b/sys-cluster/ceph/files/ceph-mds_at.service
new file mode 100644
index 0000000..c28604e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-mds_at.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Ceph metadata server daemon
+After=network-online.target local-fs.target
+Wants=network-online.target local-fs.target
+PartOf=ceph.target
+
+[Service]
+Environment=CLUSTER=ceph
+ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i
+
+[Install]
+WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph-mon_at.service b/sys-cluster/ceph/files/ceph-mon_at.service
new file mode 100644
index 0000000..4f54cc1
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-mon_at.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Ceph cluster monitor daemon
+After=network-online.target
+Wants=network-online.target
+
+# According to:
+# http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
+# these can be removed once ceph-mon will dynamically change network
+# configuration.
+After=network-online.target local-fs.target
+Wants=network-online.target local-fs.target
+PartOf=ceph.target
+
+[Service]
+Environment=CLUSTER=ceph
+ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
+
+[Install]
+WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph-osd_at.service b/sys-cluster/ceph/files/ceph-osd_at.service
new file mode 100644
index 0000000..7bf125f
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-osd_at.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Ceph object storage daemon
+After=network-online.target local-fs.target
+Wants=network-online.target local-fs.target
+PartOf=ceph.target
+
+[Service]
+Environment=CLUSTER=ceph
+ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i
+ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
+
+[Install]
+WantedBy=ceph.target
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2017-02-10 1:23 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2017-02-10 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 481502b6f4611334f6d48468693f92ebe05e8df0
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 01:23:27 2017 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 01:23:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481502b6
sys-cluster/ceph: Fix logrotate script to work for all cluster names
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-cluster/ceph/files/ceph.logrotate | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
index 881d7ffb43..df03f5e69a 100644
--- a/sys-cluster/ceph/files/ceph.logrotate
+++ b/sys-cluster/ceph/files/ceph.logrotate
@@ -1,8 +1,4 @@
-/var/log/ceph/admin.log
-/var/log/ceph/ceph.log
-/var/log/ceph/ceph-mon.*.log
-/var/log/ceph/ceph-mds.*.log
-/var/log/ceph/ceph-osd.*.log
+/var/log/ceph/*.log
{
rotate 7
daily
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2017-02-10 22:34 David Seifert
0 siblings, 0 replies; 27+ messages in thread
From: David Seifert @ 2017-02-10 22:34 UTC (permalink / raw
To: gentoo-commits
commit: df8009b5aa0bb2d71e2c202febb86ad406c679b5
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 15:44:51 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 22:32:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df8009b5
sys-cluster/ceph: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3900
.../ceph/files/ceph-0.80.10-cpp-backport.patch | 50 ----------
.../ceph/files/ceph-0.94.7-monitor-security.patch | 109 ---------------------
...l-doesnt-support-momit-leaf-frame-pointer.patch | 25 -----
sys-cluster/ceph/files/ceph-CVE-2016-5009.patch | 87 ----------------
4 files changed, 271 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-0.80.10-cpp-backport.patch b/sys-cluster/ceph/files/ceph-0.80.10-cpp-backport.patch
deleted file mode 100644
index ca79f0b6f4..0000000000
--- a/sys-cluster/ceph/files/ceph-0.80.10-cpp-backport.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/src/common/RWLock.h b/src/common/RWLock.h
-index 1a70ef1..2676ede 100644
---- a/src/common/RWLock.h
-+++ b/src/common/RWLock.h
-@@ -18,6 +18,7 @@
- #define CEPH_RWLock_Posix__H
-
- #include <pthread.h>
-+#include "include/assert.h"
- #include "lockdep.h"
- #include "include/atomic.h"
-
-diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
-index 39e3429..64cd74f 100644
---- a/src/osd/ECBackend.cc
-+++ b/src/osd/ECBackend.cc
-@@ -13,7 +13,7 @@
- */
-
- #include <boost/variant.hpp>
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- #include <iostream>
- #include <sstream>
-
-@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs)
- lhs << "read_result_t(r=" << rhs.r
- << ", errors=" << rhs.errors;
- if (rhs.attrs) {
-- lhs << ", attrs=" << rhs.attrs;
-+ lhs << ", attrs=" << rhs.attrs.get();
- } else {
- lhs << ", noattrs";
- }
-diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
-index c8fb01e..b04f8f4 100644
---- a/src/osd/ReplicatedPG.cc
-+++ b/src/osd/ReplicatedPG.cc
-@@ -5065,7 +5065,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
- for (list<OpContext::NotifyAck>::iterator p = ctx->notify_acks.begin();
- p != ctx->notify_acks.end();
- ++p) {
-- dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl;
-+ if (p->watch_cookie)
-+ dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl;
-+ else
-+ dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl;
- for (map<pair<uint64_t, entity_name_t>, WatchRef>::iterator i =
- ctx->obc->watchers.begin();
- i != ctx->obc->watchers.end();
diff --git a/sys-cluster/ceph/files/ceph-0.94.7-monitor-security.patch b/sys-cluster/ceph/files/ceph-0.94.7-monitor-security.patch
deleted file mode 100644
index b225a6fd6b..0000000000
--- a/sys-cluster/ceph/files/ceph-0.94.7-monitor-security.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From b78a1be835706e7dabc505be343945d0ac05697d Mon Sep 17 00:00:00 2001
-From: Kefu Chai <kchai@redhat.com>
-Date: Thu, 30 Jun 2016 13:24:22 +0800
-Subject: [PATCH] mon: Monitor: validate prefix on handle_command()
-
-Fixes: http://tracker.ceph.com/issues/16297
-
-Signed-off-by: You Ji <youji@ebay.com>
-(cherry picked from commit 7cb3434fed03a5497abfd00bcec7276b70df0654)
-
-Conflicts:
- src/mon/Monitor.cc (the signature of Monitor::reply_command()
- changed a little bit in master, so adapt the
- commit to work with the old method)
----
- src/mon/Monitor.cc | 23 ++++++++++++++++++++++-
- src/test/librados/cmd.cc | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 57 insertions(+), 1 deletion(-)
-
-diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
-index 48563ad..d499f0c 100644
---- a/src/mon/Monitor.cc
-+++ b/src/mon/Monitor.cc
-@@ -2565,7 +2565,19 @@ void Monitor::handle_command(MMonCommand *m)
- return;
- }
-
-- cmd_getval(g_ceph_context, cmdmap, "prefix", prefix);
-+ // check return value. If no prefix parameter provided,
-+ // return value will be false, then return error info.
-+ if(!cmd_getval(g_ceph_context, cmdmap, "prefix", prefix)) {
-+ reply_command(m, -EINVAL, "command prefix not found", 0);
-+ return;
-+ }
-+
-+ // check prefix is empty
-+ if (prefix.empty()) {
-+ reply_command(m, -EINVAL, "command prefix must not be empty", 0);
-+ return;
-+ }
-+
- if (prefix == "get_command_descriptions") {
- bufferlist rdata;
- Formatter *f = Formatter::create("json");
-@@ -2586,6 +2598,15 @@ void Monitor::handle_command(MMonCommand *m)
- boost::scoped_ptr<Formatter> f(Formatter::create(format));
-
- get_str_vec(prefix, fullcmd);
-+
-+ // make sure fullcmd is not empty.
-+ // invalid prefix will cause empty vector fullcmd.
-+ // such as, prefix=";,,;"
-+ if (fullcmd.empty()) {
-+ reply_command(m, -EINVAL, "command requires a prefix to be valid", 0);
-+ return;
-+ }
-+
- module = fullcmd[0];
-
- // validate command is in leader map
-diff --git a/src/test/librados/cmd.cc b/src/test/librados/cmd.cc
-index 4f327a0..0a7ed16 100644
---- a/src/test/librados/cmd.cc
-+++ b/src/test/librados/cmd.cc
-@@ -49,6 +49,41 @@ TEST(LibRadosCmd, MonDescribe) {
- rados_buffer_free(buf);
- rados_buffer_free(st);
-
-+ cmd[0] = (char *)"";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "{}", 2, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"abc\":\"something\"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"prefix\":\"\"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"prefix\":\" \"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"prefix\":\";;;,,,;;,,\"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"prefix\":\"extra command\"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
- cmd[0] = (char *)"{\"prefix\":\"mon_status\"}";
- ASSERT_EQ(0, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
- ASSERT_LT(0u, buflen);
---
-2.9.0
-
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch b/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch
deleted file mode 100644
index 38d479a8e4..0000000000
--- a/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0160e50fa9b255ad338a50b97bcbb2bfa56aa93d Mon Sep 17 00:00:00 2001
-From: Your Name <you@example.com>
-Date: Tue, 3 May 2016 10:51:54 -0500
-Subject: [PATCH] armv7l doesnt support -momit-leaf-frame-pointer
-
----
- src/rocksdb/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rocksdb/Makefile b/src/rocksdb/Makefile
-index c64ea36..541dbf3 100644
---- a/src/rocksdb/Makefile
-+++ b/src/rocksdb/Makefile
-@@ -84,7 +84,7 @@ 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
-+ifneq ($(MACHINE),$(filter $(MACHINE),ppc64 armv7l)) # ppc64 and armv7l doesn't support -momit-leaf-frame-pointer
- OPT += -momit-leaf-frame-pointer
- endif
- endif
---
-2.7.3
-
diff --git a/sys-cluster/ceph/files/ceph-CVE-2016-5009.patch b/sys-cluster/ceph/files/ceph-CVE-2016-5009.patch
deleted file mode 100644
index 1528dadbe9..0000000000
--- a/sys-cluster/ceph/files/ceph-CVE-2016-5009.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
-index 10c8bfc..98843d7 100644
---- a/src/mon/Monitor.cc
-+++ b/src/mon/Monitor.cc
-@@ -2631,7 +2631,19 @@ void Monitor::handle_command(MonOpRequestRef op)
- return;
- }
-
-- cmd_getval(g_ceph_context, cmdmap, "prefix", prefix);
-+ // check return value. If no prefix parameter provided,
-+ // return value will be false, then return error info.
-+ if(!cmd_getval(g_ceph_context, cmdmap, "prefix", prefix)) {
-+ reply_command(op, -EINVAL, "command prefix not found", 0);
-+ return;
-+ }
-+
-+ // check prefix is empty
-+ if (prefix.empty()) {
-+ reply_command(op, -EINVAL, "command prefix must not be empty", 0);
-+ return;
-+ }
-+
- if (prefix == "get_command_descriptions") {
- bufferlist rdata;
- Formatter *f = Formatter::create("json");
-@@ -2652,6 +2664,15 @@ void Monitor::handle_command(MonOpRequestRef op)
- boost::scoped_ptr<Formatter> f(Formatter::create(format));
-
- get_str_vec(prefix, fullcmd);
-+
-+ // make sure fullcmd is not empty.
-+ // invalid prefix will cause empty vector fullcmd.
-+ // such as, prefix=";,,;"
-+ if (fullcmd.empty()) {
-+ reply_command(op, -EINVAL, "command requires a prefix to be valid", 0);
-+ return;
-+ }
-+
- module = fullcmd[0];
-
- // validate command is in leader map
-diff --git a/src/test/librados/cmd.cc b/src/test/librados/cmd.cc
-index 9261fb5..878a8af 100644
---- a/src/test/librados/cmd.cc
-+++ b/src/test/librados/cmd.cc
-@@ -48,6 +48,41 @@ TEST(LibRadosCmd, MonDescribe) {
- rados_buffer_free(buf);
- rados_buffer_free(st);
-
-+ cmd[0] = (char *)"";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "{}", 2, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"abc\":\"something\"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"prefix\":\"\"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"prefix\":\" \"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"prefix\":\";;;,,,;;,,\"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
-+ cmd[0] = (char *)"{\"prefix\":\"extra command\"}";
-+ ASSERT_EQ(-EINVAL, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-+ rados_buffer_free(buf);
-+ rados_buffer_free(st);
-+
- cmd[0] = (char *)"{\"prefix\":\"mon_status\"}";
- ASSERT_EQ(0, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
- ASSERT_LT(0u, buflen);
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2017-07-31 16:30 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2017-07-31 16:30 UTC (permalink / raw
To: gentoo-commits
commit: caa9b3b2b6f40f4c925273553f240619a2498ca3
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 16:30:01 2017 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 16:30:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa9b3b2
sys-cluster/ceph: Update default ulimits in 10.2.9 to more match upstream
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sys-cluster/ceph/files/ceph.initd-r5 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/ceph/files/ceph.initd-r5 b/sys-cluster/ceph/files/ceph.initd-r5
index 9ed23b8489a..7087de60517 100644
--- a/sys-cluster/ceph/files/ceph.initd-r5
+++ b/sys-cluster/ceph/files/ceph.initd-r5
@@ -9,7 +9,7 @@ daemon_id="${daemon_id:-0}"
: ${rundir:=/run/ceph}
: ${user:=ceph}
: ${group:=ceph}
-: ${rc_ulimit:=-n 32768}
+: ${rc_ulimit:=-n 131072 -u 257256}
pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2017-10-19 22:56 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2017-10-19 22:56 UTC (permalink / raw
To: gentoo-commits
commit: a82b7969991774a76af7ace06e5d5ee008f8d518
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 22:56:20 2017 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 22:56:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82b7969
sys-cluster/ceph: initd: don't log all daemons to same file
Package-Manager: Portage-2.3.11, Repoman-2.3.3
sys-cluster/ceph/files/ceph.confd-r3 | 2 ++
sys-cluster/ceph/files/ceph.initd-r5 | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/ceph/files/ceph.confd-r3 b/sys-cluster/ceph/files/ceph.confd-r3
index 54673c2688f..281037c5998 100644
--- a/sys-cluster/ceph/files/ceph.confd-r3
+++ b/sys-cluster/ceph/files/ceph.confd-r3
@@ -14,6 +14,8 @@
# settings for openrc supervisor for various ceph daemons
#
# defaults (can be overidden for each daemon)
+# stderr and stdout values get .${id}-std{out,err}.log appended to the provided value
+#
#respawn_delay=20
#respawn_max=5
#respawn_period=1800
diff --git a/sys-cluster/ceph/files/ceph.initd-r5 b/sys-cluster/ceph/files/ceph.initd-r5
index 7087de60517..18f539a57a8 100644
--- a/sys-cluster/ceph/files/ceph.initd-r5
+++ b/sys-cluster/ceph/files/ceph.initd-r5
@@ -73,7 +73,7 @@ start_pre() {
fi
if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}"
+ supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
fi
done
}
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2017-11-05 15:39 Patrice Clement
0 siblings, 0 replies; 27+ messages in thread
From: Patrice Clement @ 2017-11-05 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 1e215f2aa665a692dd99b4dbd2f8d2bd437cfc9a
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Oct 22 16:47:00 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Nov 5 15:38:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e215f2a
sys-cluster/ceph: remove unused patche/files.
Closes: https://github.com/gentoo/gentoo/pull/6014
...sgw-swift-clean-up-flush-newline-behavior.patch | 92 ----------------------
sys-cluster/ceph/files/ceph-mon_at.service | 19 -----
sys-cluster/ceph/files/ceph.initd-r1.1 | 39 ---------
sys-cluster/ceph/files/ceph.target | 4 -
4 files changed, 154 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch b/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch
deleted file mode 100644
index 3202de3cbe9..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 39848e41b7c517cc5faab1ccf77c2804fd7d2628 Mon Sep 17 00:00:00 2001
-From: Marcus Watts <mwatts@redhat.com>
-Date: Wed, 11 Jan 2017 00:06:15 -0500
-Subject: [PATCH] radosgw/swift: clean up flush / newline behavior.
-
-The current code emits a newline after swift errors, but fails
-to account for it when it calculates 'content-length'. This results in
-some clients (go github.com/ncw/swift) producing complaints about the
-unsolicited newline such as this,
- Unsolicited response received on idle HTTP channel starting with "\n"; err=<nil>
-
-This logic eliminates the newline on flush. This makes the content length
-calculation correct and eliminates the stray newline.
-
-There was already existing separator logic in the rgw plain formatter
-that can emit a newline at the correct point. It had been checking
-"len" to decide if previous data had been emitted, but that's reset to 0
-by flush(). So, this logic adds a new per-instance variable to separately
-track state that it emitted a previous item (and should emit a newline).
-
-Fixes: http://tracker.ceph.com/issues/18473
-Signed-off-by: Marcus Watts <mwatts@redhat.com>
-Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
-(cherry picked from commit 5f229d6a33eae4906f22cdb90941835e47ee9f02)
----
- src/rgw/rgw_formats.cc | 11 +++++++----
- src/rgw/rgw_formats.h | 1 +
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/rgw/rgw_formats.cc b/src/rgw/rgw_formats.cc
-index 698ec96..61e9b66 100644
---- a/src/rgw/rgw_formats.cc
-+++ b/src/rgw/rgw_formats.cc
-@@ -25,6 +25,7 @@ RGWFormatter_Plain::RGWFormatter_Plain(const bool ukv)
- : buf(NULL),
- len(0),
- max_len(0),
-+ wrote_something(false),
- min_stack_level(0),
- use_kv(ukv)
- {
-@@ -41,7 +42,7 @@ void RGWFormatter_Plain::flush(ostream& os)
- return;
-
- if (len) {
-- os << buf << "\n";
-+ os << buf;
- os.flush();
- }
-
-@@ -156,13 +157,14 @@ void RGWFormatter_Plain::dump_format_va(const char *name, const char *ns, bool q
- vsnprintf(buf, LARGE_SIZE, fmt, ap);
-
- const char *eol;
-- if (len) {
-+ if (wrote_something) {
- if (use_kv && entry.is_array && entry.size > 1)
- eol = ", ";
- else
- eol = "\n";
- } else
- eol = "";
-+ wrote_something = true;
-
- if (use_kv && !entry.is_array)
- write_data("%s%s: %s", eol, name, buf);
-@@ -268,10 +270,11 @@ void RGWFormatter_Plain::dump_value_int(const char *name, const char *fmt, ...)
- va_end(ap);
-
- const char *eol;
-- if (len)
-+ if (wrote_something) {
- eol = "\n";
-- else
-+ } else
- eol = "";
-+ wrote_something = true;
-
- if (use_kv && !entry.is_array)
- write_data("%s%s: %s", eol, name, buf);
-diff --git a/src/rgw/rgw_formats.h b/src/rgw/rgw_formats.h
-index 9df5251..1c5afd1 100644
---- a/src/rgw/rgw_formats.h
-+++ b/src/rgw/rgw_formats.h
-@@ -56,6 +56,7 @@ class RGWFormatter_Plain : public Formatter {
- std::list<struct plain_stack_entry> stack;
- size_t min_stack_level;
- bool use_kv;
-+ bool wrote_something;
- };
-
- class RGWFormatterFlusher {
diff --git a/sys-cluster/ceph/files/ceph-mon_at.service b/sys-cluster/ceph/files/ceph-mon_at.service
deleted file mode 100644
index 4f54cc158c5..00000000000
--- a/sys-cluster/ceph/files/ceph-mon_at.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Ceph cluster monitor daemon
-After=network-online.target
-Wants=network-online.target
-
-# According to:
-# http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
-# these can be removed once ceph-mon will dynamically change network
-# configuration.
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph.initd-r1.1 b/sys-cluster/ceph/files/ceph.initd-r1.1
deleted file mode 100644
index bb603259715..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r1.1
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-
-depend() {
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- checkpath -d -q -o ceph "$(dirname "${pidfile}")"
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
- fi
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
- eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.target b/sys-cluster/ceph/files/ceph.target
deleted file mode 100644
index 60734baff68..00000000000
--- a/sys-cluster/ceph/files/ceph.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=ceph target allowing to start/stop all ceph*@.service instances at once
-[Install]
-WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2018-08-07 23:37 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2018-08-07 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 2baf0a29ab0bcbaefba5a966346f2628237e3610
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 7 19:38:34 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 23:36:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2baf0a29
sys-cluster/ceph: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/9495
...2.9-filestore_fix_infinit_loops_in_fiemap.patch | 82 -----------
...triper_fix_format_injection_vulnerability.patch | 35 -----
..._error_codes_from_is_exclusive_lock_owner.patch | 28 ----
...ecifies_clone_ver_but_transaction_include.patch | 39 ------
...t_attempt_to_load_key_if_auth_is_disabled.patch | 39 ------
...elax_size_check_for_newer_kernel_versions.patch | 28 ----
...ck_sdata_op_ordering_lock_with_sdata_lock.patch | 32 -----
.../files/ceph-12.2.2-build-without-radosgw.patch | 34 -----
.../ceph/files/ceph-12.2.4-boost-sonames.patch | 152 ---------------------
sys-cluster/ceph/files/ceph.confd-r2 | 8 --
sys-cluster/ceph/files/ceph.initd-r4 | 49 -------
sys-cluster/ceph/files/ceph.initd-r5 | 87 ------------
sys-cluster/ceph/files/ceph.initd-r6 | 87 ------------
13 files changed, 700 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch b/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch
deleted file mode 100644
index e67113e51cc..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b52bfe6b443f0ff88c8614441752102058063699 Mon Sep 17 00:00:00 2001
-From: Ning Yao <yaoning@unitedstack.com>
-Date: Thu, 6 Apr 2017 11:12:04 +0000
-Subject: [PATCH] os/filestore: fix infinit loops in fiemap()
-
-since fiemap can get extents based on offset --> len
-but we should consider last extents is retrieved when len == 0
-even though it is not last fiemap extents
-
-Signed-off-by: Ning Yao <yaoning@unitedstack.com>
-(cherry picked from commit 36f6b668a8910d76847674086cbc86910c78faee)
----
- src/os/filestore/FileStore.cc | 13 +++++--------
- src/test/objectstore/store_test.cc | 21 +++++++++++++++++++++
- 2 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
-index c47b0d0d2eae..95f48cdf4960 100644
---- a/src/os/filestore/FileStore.cc
-+++ b/src/os/filestore/FileStore.cc
-@@ -3102,17 +3102,14 @@ int FileStore::_do_fiemap(int fd, uint64_t offset, size_t len,
- i++;
- last = extent++;
- }
-- const bool is_last = last->fe_flags & FIEMAP_EXTENT_LAST;
-+ uint64_t xoffset = last->fe_logical + last->fe_length - offset;
-+ offset = last->fe_logical + last->fe_length;
-+ len -= xoffset;
-+ const bool is_last = (last->fe_flags & FIEMAP_EXTENT_LAST) || (len == 0);
-+ free(fiemap);
- if (!is_last) {
-- uint64_t xoffset = last->fe_logical + last->fe_length - offset;
-- offset = last->fe_logical + last->fe_length;
-- len -= xoffset;
-- free(fiemap); /* fix clang warn: use-after-free */
- goto more;
- }
-- else {
-- free(fiemap);
-- }
-
- return r;
- }
-diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
-index 5ab011ad17d8..4cada7e2e435 100644
---- a/src/test/objectstore/store_test.cc
-+++ b/src/test/objectstore/store_test.cc
-@@ -279,6 +279,7 @@ TEST_P(StoreTest, FiemapHoles) {
- ASSERT_EQ(r, 0);
- }
- {
-+ //fiemap test from 0 to SKIP_STEP * (MAX_EXTENTS - 1) + 3
- bufferlist bl;
- store->fiemap(cid, oid, 0, SKIP_STEP * (MAX_EXTENTS - 1) + 3, bl);
- map<uint64_t,uint64_t> m, e;
-@@ -295,6 +296,26 @@ TEST_P(StoreTest, FiemapHoles) {
- ASSERT_TRUE((m.size() == 1 &&
- m[0] > SKIP_STEP * (MAX_EXTENTS - 1)) ||
- (m.size() == MAX_EXTENTS && extents_exist));
-+
-+ // fiemap test from SKIP_STEP to SKIP_STEP * (MAX_EXTENTS - 2) + 3
-+ // reset bufferlist and map
-+ bl.clear();
-+ m.clear();
-+ e.clear();
-+ store->fiemap(cid, oid, SKIP_STEP, SKIP_STEP * (MAX_EXTENTS - 2) + 3, bl);
-+ p = bl.begin();
-+ ::decode(m, p);
-+ cout << " got " << m << std::endl;
-+ ASSERT_TRUE(!m.empty());
-+ ASSERT_GE(m[SKIP_STEP], 3u);
-+ extents_exist = true;
-+ if (m.size() == (MAX_EXTENTS - 2)) {
-+ for (uint64_t i = 1; i < MAX_EXTENTS - 1; i++)
-+ extents_exist = extents_exist && m.count(SKIP_STEP*i);
-+ }
-+ ASSERT_TRUE((m.size() == 1 &&
-+ m[SKIP_STEP] > SKIP_STEP * (MAX_EXTENTS - 2)) ||
-+ (m.size() == (MAX_EXTENTS - 1) && extents_exist));
- }
- {
- ObjectStore::Transaction t;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch b/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch
deleted file mode 100644
index eaf18c35783..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/libradosstriper/RadosStriperImpl.cc b/src/libradosstriper/RadosStriperImpl.cc
-index 22352d9125..70dcb7569f 100644
---- a/src/libradosstriper/RadosStriperImpl.cc
-+++ b/src/libradosstriper/RadosStriperImpl.cc
-@@ -12,6 +12,8 @@
- *
- */
-
-+#include <boost/algorithm/string/replace.hpp>
-+
- #include "libradosstriper/RadosStriperImpl.h"
-
- #include <errno.h>
-@@ -466,7 +468,9 @@ int libradosstriper::RadosStriperImpl::aio_read(const std::string& soid,
- // get list of extents to be read from
- vector<ObjectExtent> *extents = new vector<ObjectExtent>();
- if (read_len > 0) {
-- std::string format = soid + RADOS_OBJECT_EXTENSION_FORMAT;
-+ std::string format = soid;
-+ boost::replace_all(format, "%", "%%");
-+ format += RADOS_OBJECT_EXTENSION_FORMAT;
- file_layout_t l;
- l.from_legacy(layout);
- Striper::file_to_extents(cct(), format.c_str(), &l, off, read_len,
-@@ -776,7 +780,9 @@ libradosstriper::RadosStriperImpl::internal_aio_write(const std::string& soid,
- if (len > 0) {
- // get list of extents to be written to
- vector<ObjectExtent> extents;
-- std::string format = soid + RADOS_OBJECT_EXTENSION_FORMAT;
-+ std::string format = soid;
-+ boost::replace_all(format, "%", "%%");
-+ format += RADOS_OBJECT_EXTENSION_FORMAT;
- file_layout_t l;
- l.from_legacy(layout);
- Striper::file_to_extents(cct(), format.c_str(), &l, off, len, 0, extents);
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch b/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch
deleted file mode 100644
index 6800285318f..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 787ba33e5dba285dff874955a8f0d7aabd3f87fe Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Mon, 5 Jun 2017 08:17:05 -0400
-Subject: [PATCH] librbd: filter expected error codes from
- is_exclusive_lock_owner
-
-Fixes: http://tracker.ceph.com/issues/20182
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
-(cherry picked from commit d4daaf54e6bc42cd4fb2111ea20b2042941b0c31)
----
- src/librbd/internal.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
-index 9fecb1e1688f..6021be078090 100644
---- a/src/librbd/internal.cc
-+++ b/src/librbd/internal.cc
-@@ -2110,7 +2110,9 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
- // might have been blacklisted by peer -- ensure we still own
- // the lock by pinging the OSD
- int r = ictx->exclusive_lock->assert_header_locked();
-- if (r < 0) {
-+ if (r == -EBUSY || r == -ENOENT) {
-+ return 0;
-+ } else if (r < 0) {
- return r;
- }
-
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch b/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch
deleted file mode 100644
index 8bf14c2944b..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 153f77544118613e19d5e88c030c3901234cf950 Mon Sep 17 00:00:00 2001
-From: David Zafman <dzafman@redhat.com>
-Date: Tue, 18 Jul 2017 15:08:14 -0700
-Subject: [PATCH] osd: scrub_to specifies clone ver, but transaction include
- head write ver
-
-Fixes: http://tracker.ceph.com/issues/20041
-
-Signed-off-by: David Zafman <dzafman@redhat.com>
-(cherry picked from commit fd598a0d23d61c645633ae774c3404a43d035e3c)
-
-Conflicts:
- src/osd/ReplicatedPG.cc (trivial)
----
- src/osd/ReplicatedPG.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
-index 4b4dc34c602a..4d80ad1770e1 100644
---- a/src/osd/ReplicatedPG.cc
-+++ b/src/osd/ReplicatedPG.cc
-@@ -8318,7 +8318,7 @@ void ReplicatedPG::op_applied(const eversion_t &applied_version)
- last_update_applied = applied_version;
- if (is_primary()) {
- if (scrubber.active) {
-- if (last_update_applied == scrubber.subset_last_update) {
-+ if (last_update_applied >= scrubber.subset_last_update) {
- requeue_scrub();
- }
- } else {
-@@ -8326,7 +8326,7 @@ void ReplicatedPG::op_applied(const eversion_t &applied_version)
- }
- } else {
- if (scrubber.active_rep_scrub) {
-- if (last_update_applied == static_cast<MOSDRepScrub*>(
-+ if (last_update_applied >= static_cast<MOSDRepScrub*>(
- scrubber.active_rep_scrub->get_req())->scrub_to) {
- osd->op_wq.queue(
- make_pair(
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch b/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch
deleted file mode 100644
index 4b03e335bc5..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0cd7df3649d7486d444a61cab89c48a89ddd3e8d Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Thu, 29 Jun 2017 14:54:40 -0400
-Subject: [PATCH] rbd: do not attempt to load key if auth is disabled
-
-Fixes: http://tracker.ceph.com/issues/19035
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
-(cherry picked from commit 8b9c8df6d7f0b75c5451953bb322bc1f9afb6299)
----
- src/krbd.cc | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/krbd.cc b/src/krbd.cc
-index a0e546fa7f6f..2bb6b4270abd 100644
---- a/src/krbd.cc
-+++ b/src/krbd.cc
-@@ -129,13 +129,15 @@ static int build_map_buf(CephContext *cct, const char *pool, const char *image,
- oss << " name=" << cct->_conf->name.get_id();
-
- KeyRing keyring;
-- r = keyring.from_ceph_context(cct);
-- if (r == -ENOENT && !(cct->_conf->keyfile.length() ||
-- cct->_conf->key.length()))
-- r = 0;
-- if (r < 0) {
-- cerr << "rbd: failed to get secret" << std::endl;
-- return r;
-+ if (cct->_conf->auth_client_required != "none") {
-+ r = keyring.from_ceph_context(cct);
-+ if (r == -ENOENT && !(cct->_conf->keyfile.length() ||
-+ cct->_conf->key.length()))
-+ r = 0;
-+ if (r < 0) {
-+ cerr << "rbd: failed to get secret" << std::endl;
-+ return r;
-+ }
- }
-
- CryptoKey secret;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch b/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch
deleted file mode 100644
index 5cb89be0edf..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
-index 2e399ab832..88e1e0ff65 100644
---- a/src/tools/rbd_nbd/rbd-nbd.cc
-+++ b/src/tools/rbd_nbd/rbd-nbd.cc
-@@ -469,6 +469,10 @@ static int open_device(const char* path, bool try_load_moudle = false)
-
- static int check_device_size(int nbd_index, unsigned long expected_size)
- {
-+ // There are bugs with some older kernel versions that result in an
-+ // overflow for large image sizes. This check is to ensure we are
-+ // not affected.
-+
- unsigned long size = 0;
- std::string path = "/sys/block/nbd" + stringify(nbd_index) + "/size";
- std::ifstream ifs;
-@@ -480,6 +484,12 @@ static int check_device_size(int nbd_index, unsigned long expected_size)
- ifs >> size;
- size *= RBD_NBD_BLKSIZE;
-
-+ if (size == 0) {
-+ // Newer kernel versions will report real size only after nbd
-+ // connect. Assume this is the case and return success.
-+ return 0;
-+ }
-+
- if (size != expected_size) {
- cerr << "rbd-nbd: kernel reported invalid device size (" << size
- << ", expected " << expected_size << ")" << std::endl;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch b/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch
deleted file mode 100644
index 60f46ab36a4..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3fa277b479d69699bf5a6875cd4a5efcf9ae0788 Mon Sep 17 00:00:00 2001
-From: Alexey Sheplyakov <asheplyakov@mirantis.com>
-Date: Tue, 27 Jun 2017 16:07:01 +0400
-Subject: [PATCH] jewel: osd: unlock sdata_op_ordering_lock with sdata_lock
- hold to avoid missing wakeup signal
-
-Based on commit bc683385819146f3f6f096ceec97e1226a3cd237. The OSD code has
-been refactored a lot since Jewel, hence cherry-picking that patch introduces
-a lot of unrelated changes, and is much more difficult than reusing the idea.
-
-Fixes: http://tracker.ceph.com/issues/20428
-
-Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
----
- src/osd/OSD.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
-index f5cfda3b686a..38a2711f6f92 100644
---- a/src/osd/OSD.cc
-+++ b/src/osd/OSD.cc
-@@ -8727,9 +8727,9 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb )
- assert(NULL != sdata);
- sdata->sdata_op_ordering_lock.Lock();
- if (sdata->pqueue->empty()) {
-- sdata->sdata_op_ordering_lock.Unlock();
- osd->cct->get_heartbeat_map()->reset_timeout(hb, 4, 0);
- sdata->sdata_lock.Lock();
-+ sdata->sdata_op_ordering_lock.Unlock();
- sdata->sdata_cond.WaitInterval(osd->cct, sdata->sdata_lock, utime_t(2, 0));
- sdata->sdata_lock.Unlock();
- sdata->sdata_op_ordering_lock.Lock();
diff --git a/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch b/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch
deleted file mode 100644
index 29257c4747d..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b00ac12f4045cd39ac9a436cf32d233d16bc3485 Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Tue, 5 Dec 2017 09:58:04 -0500
-Subject: [PATCH] ceph-dencoder: moved RBD types outside of RGW preprocessor
- guard
-
-Fixes: http://tracker.ceph.com/issues/22321
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
----
- src/test/encoding/types.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
-index c061e93bd58c..4cfcb15edff1 100644
---- a/src/test/encoding/types.h
-+++ b/src/test/encoding/types.h
-@@ -405,6 +405,8 @@ TYPE(rgw_data_sync_info)
- TYPE(rgw_data_sync_marker)
- TYPE(rgw_data_sync_status)
-
-+#endif
-+
- #ifdef WITH_RBD
- #include "cls/rbd/cls_rbd.h"
- TYPE(cls_rbd_parent)
-@@ -416,8 +418,6 @@ TYPE(cls::rbd::MirrorImage)
- TYPE(cls::rbd::MirrorImageMap)
- #endif
-
--#endif
--
- #include "cls/lock/cls_lock_types.h"
- TYPE(rados::cls::lock::locker_id_t)
- TYPE_FEATUREFUL(rados::cls::lock::locker_info_t)
diff --git a/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch
deleted file mode 100644
index 59c645dea95..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7aa8a4392e..111f669f2e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -622,13 +622,13 @@ set(ceph_common_objs
- $<TARGET_OBJECTS:crush_objs>)
- set(ceph_common_deps
- json_spirit erasure_code rt ${LIB_RESOLV}
-- Boost::thread
-- Boost::system
-- Boost::regex
-- Boost::random
-- Boost::program_options
-- Boost::date_time
-- Boost::iostreams
-+ boost_thread
-+ boost_system
-+ boost_regex
-+ boost_random
-+ boost_program_options
-+ boost_date_time
-+ boost_iostreams
- ${BLKID_LIBRARIES}
- ${Backtrace_LIBRARIES}
- ${BLKIN_LIBRARIES}
-@@ -712,7 +712,7 @@ if (WITH_MGR)
- $<TARGET_OBJECTS:heap_profiler_objs>)
- target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr osdc client global-static common
-- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-+ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
- install(TARGETS ceph-mgr DESTINATION bin)
- endif (WITH_MGR)
-
-@@ -885,7 +885,7 @@ set(ceph_mds_srcs
- ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
-- Boost::thread)
-+ boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
-
- add_subdirectory(erasure-code)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index f3999e3b01..0ce7fca1ba 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -148,7 +148,7 @@ add_executable(ceph_omapbench
- )
- target_link_libraries(ceph_omapbench
- librados
-- Boost::program_options
-+ boost_program_options
- global
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
-@@ -202,7 +202,7 @@ if(${WITH_RADOSGW})
- cls_rgw_client
- cls_user_client
- cls_lock_client
-- Boost::regex
-+ boost_regex
- ${BLKID_LIBRARIES}
- ${CURL_LIBRARIES}
- ${EXPAT_LIBRARIES}
-@@ -232,7 +232,7 @@ if(${WITH_RADOSGW})
- cls_rgw_client
- cls_user_client
- cls_lock_client
-- Boost::regex
-+ boost_regex
- ${BLKID_LIBRARIES}
- ${CURL_LIBRARIES}
- ${EXPAT_LIBRARIES}
-diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
-index 9fba701e05..da3cbcfe96 100644
---- a/src/test/bench/CMakeLists.txt
-+++ b/src/test/bench/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(smalliobench_srcs
- add_executable(ceph_smalliobench
- ${smalliobench_srcs}
- )
--target_link_libraries(ceph_smalliobench librados Boost::program_options global
-+target_link_libraries(ceph_smalliobench librados boost_program_options global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_smalliobenchrbd
-@@ -27,7 +27,7 @@ if(WITH_RBD)
- librados
- os
- global
-- Boost::program_options
-+ boost_program_options
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
- )
-@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
- add_executable(ceph_smalliobenchfs
- ${ceph_smalliobenchfs_srcs}
- )
--target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_smalliobenchdumb
-@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
- add_executable(ceph_smalliobenchdumb
- ${smalliobenchdumb_srcs}
- )
--target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_tpbench
-@@ -73,7 +73,7 @@ set(tpbench_srcs
- add_executable(ceph_tpbench
- ${tpbench_srcs}
- )
--target_link_libraries(ceph_tpbench librados Boost::program_options global
-+target_link_libraries(ceph_tpbench librados boost_program_options global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- install(TARGETS
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 7502085895..1a430c201a 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -23,13 +23,13 @@ target_link_libraries(ceph_radosacl librados global)
- install(TARGETS ceph_radosacl DESTINATION bin)
-
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
-
- add_executable(ceph-monstore-tool
- ceph_monstore_tool.cc
- ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- install(PROGRAMS
- ceph-monstore-update-crush.sh
-@@ -40,7 +40,7 @@ add_executable(ceph-objectstore-tool
- ceph_objectstore_tool.cc
- rebuild_mondb.cc
- RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
- target_link_libraries(ceph-objectstore-tool fuse)
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph.confd-r2 b/sys-cluster/ceph/files/ceph.confd-r2
deleted file mode 100644
index 13b1cfad458..00000000000
--- a/sys-cluster/ceph/files/ceph.confd-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
-
-# Set ulimits for Ceph services.
-rc_ulimit="-n 32768"
-
-# initd stop timeout.
-#CEPH_TERMTIMEOUT="TERM/60/KILL/5"
diff --git a/sys-cluster/ceph/files/ceph.initd-r4 b/sys-cluster/ceph/files/ceph.initd-r4
deleted file mode 100644
index 33e1a3002ac..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r4
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-start_stop_daemon_args="--user ceph --group ceph"
-retry="${CEPH_TERMTIMEOUT:-TERM/60/KILL/5}"
-
-depend() {
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o ceph "$(dirname "${pidfile}")"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
- fi
-
- if pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
- eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r5 b/sys-cluster/ceph/files/ceph.initd-r5
deleted file mode 100644
index 18f539a57a8..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r5
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 131072 -u 257256}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/dev/null}
-: ${stderr:=/dev/null}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- local arg_name arg_val
- for arg_name in std{out,err} respawn_{delay,max,period}; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r6 b/sys-cluster/ceph/files/ceph.initd-r6
deleted file mode 100644
index fd31b17eb5e..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r6
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/dev/null}
-: ${stderr:=/dev/null}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- local arg_name arg_val
- for arg_name in std{out,err} respawn_{delay,max,period}; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2019-03-25 23:59 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2019-03-25 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 0e8b3bbc6b59171c3dc6190ad4b54530b8768399
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Mar 25 18:12:52 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 23:59:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8b3bbc
sys-cluster/ceph: remove unused files
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11498
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/files/ceph.initd-r10 | 108 -------------------------------
sys-cluster/ceph/files/ceph.initd-r8 | 95 ---------------------------
sys-cluster/ceph/files/ceph.logrotate-r1 | 18 ------
3 files changed, 221 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph.initd-r10 b/sys-cluster/ceph/files/ceph.initd-r10
deleted file mode 100644
index 2f5150fc340..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r10
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/var/log/ceph/ceph}
-: ${stderr:=/var/log/ceph/ceph}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- local logdir
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- if [ -n "${bluestore_osd_fsid}" ]; then
- einfo "Mounting Bluestore"
- ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
- fi
-
- if [ ${daemon_type} = radosgw ] && [ ${RADOSGW_WANT_NAME_PARAM} = y ]; then
- command_args="${command_args} --name client.${daemon_id}"
- fi
-
- local arg_name arg_val
- for arg_name in std{out,err} respawn_{delay,max,period}; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- local log_file log_postfix
- log_postfix=".${daemon_id}-${arg_name}.log"
- log_file="${arg_val}"
-
- if [ "${log_file}" != /dev/null ]; then
- log_file="${log_file}${log_postfix}"
- fi
-
- log_dir="$(dirname "${log_file}")"
- checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
-
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r8 b/sys-cluster/ceph/files/ceph.initd-r8
deleted file mode 100644
index 2ef2ed1890d..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r8
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/var/log/ceph/ceph}
-: ${stderr:=/var/log/ceph/ceph}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- local arg_name arg_val
- for arg_name in std{out,err} respawn_{delay,max,period}; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- local log_file log_postfix
- log_postfix=".${daemon_id}-${arg_name}.log"
- log_file="${arg_val}"
-
- if [ "${log_file}" != /dev/null ]; then
- log_file="${log_file}${log_postfix}"
- fi
-
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.logrotate-r1 b/sys-cluster/ceph/files/ceph.logrotate-r1
deleted file mode 100644
index df03f5e69a4..00000000000
--- a/sys-cluster/ceph/files/ceph.logrotate-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/log/ceph/*.log
-{
- rotate 7
- daily
- compress
- sharedscripts
- prerotate
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
- ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null
- done
- endscript
- postrotate
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
- ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null
- done
- endscript
- missingok
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2019-04-20 1:29 Aaron Bauman
0 siblings, 0 replies; 27+ messages in thread
From: Aaron Bauman @ 2019-04-20 1:29 UTC (permalink / raw
To: gentoo-commits
commit: fb3ec4695deb9603c1fd7d5061af68e68041f75f
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Apr 17 06:56:42 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 01:27:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3ec469
sys-cluster/ceph: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11718
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/ceph-10.2.0-dont-use-virtualenvs.patch | 95 ------
sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch | 11 -
.../ceph/files/ceph-10.2.1-unbundle-jerasure.patch | 355 ---------------------
.../ceph/files/ceph-10.2.3-CVE-2016-8626.patch | 33 --
.../files/ceph-10.2.3-build-without-openldap.patch | 32 --
...ndings-and-tests-compatible-with-Python-3.patch | 22 --
...-Python-bindings-compatible-with-Python-3.patch | 45 ---
.../ceph-10.2.7-fix-compilation-with-zstd.patch | 49 ---
sys-cluster/ceph/files/ceph-10.2.9-cflags.patch | 15 -
.../files/ceph-10.2.9-dont-run-lsb_release.patch | 65 ----
sys-cluster/ceph/files/ceph.confd-r1 | 4 -
sys-cluster/ceph/files/ceph.confd-r3 | 63 ----
sys-cluster/ceph/files/ceph.initd-r2 | 40 ---
sys-cluster/ceph/files/ceph.initd-r7 | 87 -----
14 files changed, 916 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch b/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch
deleted file mode 100644
index f3627636aeb..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 7734be2..ba33bda 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -79,7 +79,6 @@ clean-local:
- cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \
- fi
-
-- @rm -rf src/test/virtualenv
- @rm -rf install-deps-*
-
-
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index df225d6..ca030cf 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -297,10 +297,6 @@ LIBCIVETWEB_DEPS =
- DENCODER_SOURCES =
- DENCODER_DEPS =
-
--# put virtualenvs in this directory
--# otherwise it may overflow #! 80 kernel limit
--# beware that some build environments might not be able to write to /tmp
- export TMPDIR ?= /tmp
--export CEPH_BUILD_VIRTUALENV = $(TMPDIR)
-
- radoslibdir = $(libdir)/rados-classes
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
-index 8ddcb1e..52dd5d5 100644
---- a/src/ceph-detect-init/Makefile.am
-+++ b/src/ceph-detect-init/Makefile.am
-@@ -53,15 +53,10 @@ EXTRA_DIST += \
- ceph-detect-init/tests/test_all.py \
- ceph-detect-init/tox.ini
-
--export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv
--
--ceph-detect-init-all: ${CEPH_DETECT_INIT_VIRTUALENV}
--
--${CEPH_DETECT_INIT_VIRTUALENV}:
-- cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e .
-+ceph-detect-init-all:
-
- ceph-detect-init-clean:
-- cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info
-+ cd $(srcdir)/ceph-detect-init
-
- ceph-detect-init-install-data:
- cd $(srcdir)/ceph-detect-init ; \
-diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
-index 9006303..0b35b0f 100644
---- a/src/ceph-disk/Makefile.am
-+++ b/src/ceph-disk/Makefile.am
-@@ -29,15 +29,10 @@ EXTRA_DIST += \
- ceph-disk/tests/test_main.py \
- ceph-disk/tox.ini
-
--export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv
--
--ceph-disk-all: ${CEPH_DISK_VIRTUALENV}
--
--${CEPH_DISK_VIRTUALENV}:
-- cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e .
-+ceph-disk-all:
-
- ceph-disk-clean:
-- cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info
-+ cd $(srcdir)/ceph-disk
-
- ceph-disk-install-data:
- cd $(srcdir)/ceph-disk ; \
-diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
-index e730850..9569947 100644
---- a/src/tools/Makefile.am
-+++ b/src/tools/Makefile.am
-@@ -45,6 +45,3 @@ noinst_HEADERS += \
- tools/rados/PoolDump.h \
- tools/cephfs/DataScan.h \
- tools/cephfs/RoleSelector.h
--
--EXTRA_DIST += \
-- tools/setup-virtualenv.sh
-diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh
-index 9ff2d26..b6fca0a 100755
---- a/src/tools/setup-virtualenv.sh
-+++ b/src/tools/setup-virtualenv.sh
-@@ -15,6 +15,8 @@
- # GNU Library Public License for more details.
- #
-
-+exit 0
-+
- DIR=$1
- rm -fr $DIR
- mkdir -p $DIR
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch b/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch
deleted file mode 100644
index 34f8eb84bee..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ceph-10.2.1/configure.ac
-+++ ceph-10.2.1/configure.ac
-@@ -908,7 +908,7 @@
- ,
- [with_libzfs=no])
- AS_IF([test "x$with_libzfs" = xyes],
-- [PKG_CHECK_MODULES([LIBZFS], [zfs], [], [true])])
-+ [PKG_CHECK_MODULES([LIBZFS], [libzfs], [], [true])])
- AS_IF([test "x$with_libzfs" = xyes],
- [AC_DEFINE([HAVE_LIBZFS], [1], [Defined if you have libzfs enabled])])
- AM_CONDITIONAL(WITH_LIBZFS, [ test "$with_libzfs" = "yes" ])
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch
deleted file mode 100644
index 8340b4d18bf..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
-index adcb95d..8099208 100644
---- a/src/erasure-code/jerasure/Makefile.am
-+++ b/src/erasure-code/jerasure/Makefile.am
-@@ -1,52 +1,17 @@
- # jerasure plugin
- noinst_HEADERS += \
-- erasure-code/jerasure/gf-complete/include/gf_complete.h \
-- erasure-code/jerasure/gf-complete/include/gf_general.h \
-- erasure-code/jerasure/gf-complete/include/gf_int.h \
-- erasure-code/jerasure/gf-complete/include/gf_method.h \
-- erasure-code/jerasure/gf-complete/include/gf_rand.h \
-- erasure-code/jerasure/gf-complete/include/gf_w16.h \
-- erasure-code/jerasure/gf-complete/include/gf_w32.h \
-- erasure-code/jerasure/gf-complete/include/gf_w4.h \
-- erasure-code/jerasure/gf-complete/include/gf_w64.h \
-- erasure-code/jerasure/gf-complete/include/gf_w8.h \
-- erasure-code/jerasure/jerasure/include/cauchy.h \
-- erasure-code/jerasure/jerasure/include/galois.h \
-- erasure-code/jerasure/jerasure/include/jerasure.h \
-- erasure-code/jerasure/jerasure/include/liberation.h \
-- erasure-code/jerasure/jerasure/include/reed_sol.h \
- erasure-code/jerasure/ErasureCodeJerasure.h
-
- jerasure_sources = \
- erasure-code/ErasureCode.cc \
-- erasure-code/jerasure/jerasure/src/cauchy.c \
-- erasure-code/jerasure/jerasure/src/galois.c \
-- erasure-code/jerasure/jerasure/src/jerasure.c \
-- erasure-code/jerasure/jerasure/src/liberation.c \
-- erasure-code/jerasure/jerasure/src/reed_sol.c \
-- erasure-code/jerasure/gf-complete/src/gf_wgen.c \
-- erasure-code/jerasure/gf-complete/src/gf_method.c \
-- erasure-code/jerasure/gf-complete/src/gf_w16.c \
-- erasure-code/jerasure/gf-complete/src/gf.c \
-- erasure-code/jerasure/gf-complete/src/gf_w32.c \
-- erasure-code/jerasure/gf-complete/src/gf_w64.c \
-- erasure-code/jerasure/gf-complete/src/gf_w128.c \
-- erasure-code/jerasure/gf-complete/src/gf_general.c \
-- erasure-code/jerasure/gf-complete/src/gf_w4.c \
-- erasure-code/jerasure/gf-complete/src/gf_rand.c \
-- erasure-code/jerasure/gf-complete/src/gf_w8.c \
- erasure-code/jerasure/ErasureCodePluginJerasure.cc \
- erasure-code/jerasure/ErasureCodeJerasure.cc
-
- erasure-code/jerasure/ErasureCodePluginJerasure.cc: ./ceph_ver.h
-
- libec_jerasure_generic_la_SOURCES = ${jerasure_sources}
--libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
--libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS}
-+libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS}
- libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -55,20 +20,11 @@ endif
-
- erasure_codelib_LTLIBRARIES += libec_jerasure_generic.la
-
--libec_jerasure_neon_la_SOURCES = ${jerasure_sources} \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c
-+libec_jerasure_neon_la_SOURCES = ${jerasure_sources}
- libec_jerasure_neon_la_CFLAGS = ${AM_CFLAGS} \
-- ${ARM_NEON_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ ${ARM_NEON_FLAGS}
- libec_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \
-- ${ARM_NEON_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ ${ARM_NEON_FLAGS}
- libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -84,16 +40,12 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \
- ${INTEL_SSE_FLAGS} \
- ${INTEL_SSE2_FLAGS} \
- ${INTEL_SSE3_FLAGS} \
-- ${INTEL_SSSE3_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ ${INTEL_SSSE3_FLAGS}
- libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
- ${INTEL_SSE_FLAGS} \
- ${INTEL_SSE2_FLAGS} \
- ${INTEL_SSE3_FLAGS} \
-- ${INTEL_SSSE3_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ ${INTEL_SSSE3_FLAGS}
- libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -111,18 +63,14 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS} \
- ${INTEL_SSE3_FLAGS} \
- ${INTEL_SSSE3_FLAGS} \
- ${INTEL_SSE4_1_FLAGS} \
-- ${INTEL_SSE4_2_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ ${INTEL_SSE4_2_FLAGS}
- libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
- ${INTEL_SSE_FLAGS} \
- ${INTEL_SSE2_FLAGS} \
- ${INTEL_SSE3_FLAGS} \
- ${INTEL_SSSE3_FLAGS} \
- ${INTEL_SSE4_1_FLAGS} \
-- ${INTEL_SSE4_2_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ ${INTEL_SSE4_2_FLAGS}
- libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc
-index d2b72f5..acbd172 100644
---- a/src/erasure-code/shec/ErasureCodePluginShec.cc
-+++ b/src/erasure-code/shec/ErasureCodePluginShec.cc
-@@ -71,7 +71,7 @@ public:
- };
-
- extern "C" {
--#include "jerasure/include/galois.h"
-+#include "galois.h"
-
- extern gf_t *gfp_array[];
- extern int gfp_is_composite[];
-diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc
-index 2180328..c84ffc7 100644
---- a/src/erasure-code/shec/ErasureCodeShec.cc
-+++ b/src/erasure-code/shec/ErasureCodeShec.cc
-@@ -28,8 +28,8 @@
- #include "crush/CrushWrapper.h"
- #include "osd/osd_types.h"
- extern "C" {
--#include "jerasure/include/jerasure.h"
--#include "jerasure/include/galois.h"
-+#include "jerasure.h"
-+#include "galois.h"
-
- extern int calc_determinant(int *matrix, int dim);
- extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w);
-diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
-index 6b658d5..3281c60 100644
---- a/src/erasure-code/shec/Makefile.am
-+++ b/src/erasure-code/shec/Makefile.am
-@@ -4,49 +4,19 @@ shec_sources = \
- erasure-code/shec/ErasureCodePluginShec.cc \
- erasure-code/shec/ErasureCodeShec.cc \
- erasure-code/shec/ErasureCodeShecTableCache.cc \
-- erasure-code/shec/determinant.c \
-- erasure-code/jerasure/jerasure/src/cauchy.c \
-- erasure-code/jerasure/jerasure/src/galois.c \
-- erasure-code/jerasure/jerasure/src/jerasure.c \
-- erasure-code/jerasure/jerasure/src/liberation.c \
-- erasure-code/jerasure/jerasure/src/reed_sol.c \
-- erasure-code/jerasure/gf-complete/src/gf_wgen.c \
-- erasure-code/jerasure/gf-complete/src/gf_method.c \
-- erasure-code/jerasure/gf-complete/src/gf_w16.c \
-- erasure-code/jerasure/gf-complete/src/gf.c \
-- erasure-code/jerasure/gf-complete/src/gf_w32.c \
-- erasure-code/jerasure/gf-complete/src/gf_w64.c \
-- erasure-code/jerasure/gf-complete/src/gf_w128.c \
-- erasure-code/jerasure/gf-complete/src/gf_general.c \
-- erasure-code/jerasure/gf-complete/src/gf_w4.c \
-- erasure-code/jerasure/gf-complete/src/gf_rand.c \
-- erasure-code/jerasure/gf-complete/src/gf_w8.c
-+ erasure-code/shec/determinant.c
-
- noinst_HEADERS += \
- erasure-code/shec/ErasureCodeShec.h \
-- erasure-code/shec/ErasureCodeShecTableCache.h \
-- erasure-code/jerasure/jerasure/include/cauchy.h \
-- erasure-code/jerasure/jerasure/include/galois.h \
-- erasure-code/jerasure/jerasure/include/jerasure.h \
-- erasure-code/jerasure/jerasure/include/liberation.h \
-- erasure-code/jerasure/jerasure/include/reed_sol.h \
-- erasure-code/jerasure/gf-complete/include/gf_int.h \
-- erasure-code/jerasure/gf-complete/include/gf_complete.h \
-- erasure-code/jerasure/gf-complete/include/gf_rand.h \
-- erasure-code/jerasure/gf-complete/include/gf_method.h \
-- erasure-code/jerasure/gf-complete/include/gf_general.h
-+ erasure-code/shec/ErasureCodeShecTableCache.h
-
- erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h
-
- libec_shec_generic_la_SOURCES = ${shec_sources}
- libec_shec_generic_la_CFLAGS = ${AM_CFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -57,22 +27,13 @@ endif
-
- erasure_codelib_LTLIBRARIES += libec_shec_generic.la
-
--libec_shec_neon_la_SOURCES = ${shec_sources} \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \
-- erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c
-+libec_shec_neon_la_SOURCES = ${shec_sources}
- libec_shec_neon_la_CFLAGS = ${AM_CFLAGS} \
- ${ARM_NEON_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \
- ${ARM_NEON_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -91,8 +52,6 @@ libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \
- ${INTEL_SSE2_FLAGS} \
- ${INTEL_SSE3_FLAGS} \
- ${INTEL_SSSE3_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
-@@ -100,8 +59,6 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
- ${INTEL_SSE2_FLAGS} \
- ${INTEL_SSE3_FLAGS} \
- ${INTEL_SSSE3_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -122,8 +79,6 @@ libec_shec_sse4_la_CFLAGS = ${AM_CFLAGS} \
- ${INTEL_SSSE3_FLAGS} \
- ${INTEL_SSE4_1_FLAGS} \
- ${INTEL_SSE4_2_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
-@@ -133,8 +88,6 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
- ${INTEL_SSSE3_FLAGS} \
- ${INTEL_SSE4_1_FLAGS} \
- ${INTEL_SSE4_2_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-diff --git a/src/erasure-code/shec/determinant.c b/src/erasure-code/shec/determinant.c
-index 15b62c9..bf5d290 100755
---- a/src/erasure-code/shec/determinant.c
-+++ b/src/erasure-code/shec/determinant.c
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
-
--#include "jerasure/include/galois.h"
-+#include "galois.h"
-
- void print_matrix(int *mat, int dim)
- {
-diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
-index bdce080..11895ae 100644
---- a/src/test/erasure-code/Makefile.am
-+++ b/src/test/erasure-code/Makefile.am
-@@ -166,12 +166,8 @@ check_TESTPROGRAMS += unittest_erasure_code
- unittest_erasure_code_jerasure_SOURCES = \
- test/erasure-code/TestErasureCodeJerasure.cc \
- ${jerasure_sources}
--unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) \
-- -Ierasure-code/jerasure/gf-complete/include \
-- -Ierasure-code/jerasure/jerasure/include
--unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \
-- -Ierasure-code/jerasure/gf-complete/include \
-- -Ierasure-code/jerasure/jerasure/include
-+unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS)
-+unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS)
- unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
- if LINUX
- unittest_erasure_code_jerasure_LDADD += -ldl
-@@ -232,13 +228,9 @@ unittest_erasure_code_shec_SOURCES = \
- test/erasure-code/TestErasureCodeShec.cc \
- ${shec_sources}
- unittest_erasure_code_shec_CFLAGS = ${libec_shec_la_CFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -251,13 +243,9 @@ unittest_erasure_code_shec_all_SOURCES = \
- test/erasure-code/TestErasureCodeShec_all.cc \
- ${shec_sources}
- unittest_erasure_code_shec_all_CFLAGS = ${libec_shec_la_CFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_all_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_all_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -270,13 +258,9 @@ unittest_erasure_code_shec_thread_SOURCES = \
- test/erasure-code/TestErasureCodeShec_thread.cc \
- ${shec_sources}
- unittest_erasure_code_shec_thread_CFLAGS = ${libec_shec_la_CFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_thread_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_thread_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -289,13 +273,9 @@ unittest_erasure_code_shec_arguments_SOURCES = \
- test/erasure-code/TestErasureCodeShec_arguments.cc \
- ${shec_sources}
- unittest_erasure_code_shec_arguments_CFLAGS = ${libec_shec_la_CFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_arguments_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_arguments_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
diff --git a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch b/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch
deleted file mode 100644
index d767d8170df..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit dc2ffda7819d2ebeed3526d9e6da8f53221818de
-Author: Yehuda Sadeh <yehuda@redhat.com>
-Date: Thu Oct 20 10:17:36 2016 -0700
-
- rgw: handle empty POST condition
-
- Fixes: http://tracker.ceph.com/issues/17635
-
- Before accessing json entity, need to check that iterator is valid.
- If there is no entry return appropriate error code.
-
- Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
- (cherry picked from commit 23cb642243e09ca4a8e104f62a3bb7b2cbb6ea12)
-
-diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc
-index 3843511..8af70a8 100644
---- a/src/rgw/rgw_policy_s3.cc
-+++ b/src/rgw/rgw_policy_s3.cc
-@@ -286,11 +286,13 @@ int RGWPolicy::from_json(bufferlist& bl, string& err_msg)
- int r = add_condition(v[0], v[1], v[2], err_msg);
- if (r < 0)
- return r;
-- } else {
-+ } else if (!citer.end()) {
- JSONObj *c = *citer;
- dout(0) << "adding simple_check: " << c->get_name() << " : " << c->get_data() << dendl;
-
- add_simple_check(c->get_name(), c->get_data());
-+ } else {
-+ return -EINVAL;
- }
- }
- return 0;
diff --git a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch b/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch
deleted file mode 100644
index ffc16453604..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
-index c476129..cad54b8 100644
---- a/src/rgw/librgw.cc
-+++ b/src/rgw/librgw.cc
-@@ -470,7 +470,11 @@ namespace rgw {
- const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn;
- const string& ldap_dnattr =
- store->ctx()->_conf->rgw_ldap_dnattr;
-+#ifdef HAVE_OPENLDAP
- std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx());
-+#else
-+ std::string ldap_bindpw;
-+#endif /* HAVE_OPENLDAP */
-
- ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw.c_str(),
- ldap_searchdn, ldap_dnattr);
-diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
-index e9f24f3..7291e69 100644
---- a/src/rgw/rgw_rest_s3.cc
-+++ b/src/rgw/rgw_rest_s3.cc
-@@ -3091,7 +3091,11 @@ void RGW_Auth_S3::init_impl(RGWRados* store)
- const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn;
- const string& ldap_dnattr =
- store->ctx()->_conf->rgw_ldap_dnattr;
-+#ifdef HAVE_OPENLDAP
- std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx());
-+#else
-+ std::string ldap_bindpw;
-+#endif /* HAVE_OPENLDAP */
-
- ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw,
- ldap_searchdn, ldap_dnattr);
diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch
deleted file mode 100644
index 08a7920035a..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e1dc386f93eb4613dc7e89cc76a031aeee5022ba
-Author: Oleh Prypin <oleh@pryp.in>
-Date: Thu Jul 21 18:33:25 2016 +0300
-
- pybind: Make CephFS bindings and tests compatible with Python 3
-
- Signed-off-by: Oleh Prypin <oleh@pryp.in>
-
-diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx
-index ac17ada1a1..bd14de3b16 100644
---- a/src/pybind/cephfs/cephfs.pyx
-+++ b/src/pybind/cephfs/cephfs.pyx
-@@ -613,8 +613,7 @@ cdef class LibCephFS(object):
-
- if not isinstance(mode, int):
- raise TypeError('mode must be an int')
-- if isinstance(flags, basestring):
-- flags = cstr(flags, 'flags')
-+ if isinstance(flags, str_type):
- cephfs_flags = 0
- if flags == '':
- cephfs_flags = os.O_RDONLY
diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch
deleted file mode 100644
index a81aae6e7ce..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 773e01294da518c6ec18f0a8b72e05def85fef6c
-Author: Oleh Prypin <oleh@pryp.in>
-Date: Fri Jun 24 15:48:57 2016 +0300
-
- pybind: Make RBD Python bindings compatible with Python 3
-
- Signed-off-by: Oleh Prypin <oleh@pryp.in>
-
-diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
-index 52727bf39e..8f25dfbee0 100644
---- a/src/pybind/rbd/rbd.pyx
-+++ b/src/pybind/rbd/rbd.pyx
-@@ -745,7 +745,7 @@ class RBD(object):
- break
- elif ret != -errno.ERANGE:
- raise make_ex(ret, 'error listing images')
-- return [decode_cstr(name) for name in c_names[:ret].split('\0')
-+ return [decode_cstr(name) for name in c_names[:ret].split(b'\0')
- if name]
- finally:
- free(c_names)
-@@ -1885,8 +1885,8 @@ written." % (self.name, ret, length))
- raise make_ex(ret, 'error listing images')
- if ret == 0:
- return []
-- pools = map(decode_cstr, c_pools[:pools_size - 1].split('\0'))
-- images = map(decode_cstr, c_images[:images_size - 1].split('\0'))
-+ pools = map(decode_cstr, c_pools[:pools_size - 1].split(b'\0'))
-+ images = map(decode_cstr, c_images[:images_size - 1].split(b'\0'))
- return list(zip(pools, images))
- finally:
- free(c_pools)
-@@ -1933,9 +1933,9 @@ written." % (self.name, ret, length))
- raise make_ex(ret, 'error listing images')
- if ret == 0:
- return []
-- clients = map(decode_cstr, c_clients[:clients_size - 1].split('\0'))
-- cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split('\0'))
-- addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split('\0'))
-+ clients = map(decode_cstr, c_clients[:clients_size - 1].split(b'\0'))
-+ cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split(b'\0'))
-+ addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split(b'\0'))
- return {
- 'tag' : decode_cstr(c_tag),
- 'exclusive' : exclusive == 1,
diff --git a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch b/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch
deleted file mode 100644
index 4e76deabe65..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5a11f31aac4fa6a5c5ebb4fa0964e1c07a420e8c Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Wed, 12 Apr 2017 01:49:09 -0700
-Subject: [PATCH] configure: link against zstd if detected
-
-https://bugs.gentoo.org/show_bug.cgi?id=601610
----
- configure.ac | 6 ++++--
- src/Makefile-env.am | 3 +++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 51daf91..8914b71 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -851,12 +851,14 @@ AS_IF([test "x$with_librocksdb_static" = "xyes"],
- AM_CONDITIONAL(WITH_SLIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" ])
- AM_CONDITIONAL(WITH_LIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" -o "x$with_librocksdb" = "xyes" ])
-
--# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same.
-+# rocksdb detects headers in its Makefile, which forces us to do the same.
- AS_IF([test "x$with_librocksdb_static" = "xyes"], [
- AC_CHECK_HEADER([bzlib.h], [have_bzlib=yes])
-- AC_CHECK_HEADER([lz4.h], [have_lz4=yes])])
-+ AC_CHECK_HEADER([lz4.h], [have_lz4=yes])]
-+ AC_CHECK_HEADER([zstd.h], [have_zstd=yes])])
- AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"])
- AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"])
-+AM_CONDITIONAL(HAVE_ZSTD, [test "x$have_zstd" = "xyes"])
-
- # needs libcurl and libxml2
- if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 4771bad..0ee42f8 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -280,6 +280,9 @@ endif
- if HAVE_LZ4
- LIBKV += -llz4
- endif
-+if HAVE_ZSTD
-+LIBKV += -lzstd
-+endif
- endif # WITH_SLIBROCKSDB
- LIBKV += -lz -lleveldb -lsnappy
- LIBOS += $(LIBOS_TYPES) $(LIBKV) $(LIBFUSE_LIBS)
---
-2.10.2
-
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch b/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch
deleted file mode 100644
index 31221ae2f99..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 4771bad02d..f92e20479b 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -53,10 +53,6 @@ endif
- ## automake environment
-
- HARDENING_CFLAGS = \
-- -O2 \
-- -g \
-- -pipe \
-- -Wall \
- -Wp,-U_FORTIFY_SOURCE \
- -Wp,-D_FORTIFY_SOURCE=2 \
- -fexceptions \
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch b/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch
deleted file mode 100644
index a6b5515cee2..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
-index 3926ac4bec..90e2eae50c 100644
---- a/src/ceph-detect-init/Makefile.am
-+++ b/src/ceph-detect-init/Makefile.am
-@@ -67,7 +67,7 @@ ceph-detect-init-clean:
- ceph-detect-init-install-data:
- cd $(srcdir)/ceph-detect-init ; \
- if test "$(DESTDIR)" ; then \
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- options=--install-layout=deb ; \
- else \
- options=--prefix=/usr ; \
-diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
-index a8532878c8..d908b1649a 100644
---- a/src/ceph-disk/Makefile.am
-+++ b/src/ceph-disk/Makefile.am
-@@ -43,7 +43,7 @@ ceph-disk-clean:
- ceph-disk-install-data:
- cd $(srcdir)/ceph-disk ; \
- if test "$(DESTDIR)" ; then \
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- options=--install-layout=deb ; \
- else \
- options=--prefix=/usr ; \
-diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am
-index 698522daa4..c49c190986 100644
---- a/src/pybind/cephfs/Makefile.am
-+++ b/src/pybind/cephfs/Makefile.am
-@@ -15,7 +15,7 @@ cephfs-pybind-clean: ${srcdir}/ceph_ver.h
-
- cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h
- if test "$(DESTDIR)" ; then \
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- options=--install-layout=deb ; \
- else \
- options=--prefix=/usr ; \
-diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am
-index a4145bf0f4..960395fee8 100644
---- a/src/pybind/rados/Makefile.am
-+++ b/src/pybind/rados/Makefile.am
-@@ -15,7 +15,7 @@ rados-pybind-clean: ${srcdir}/ceph_ver.h
-
- rados-pybind-install-exec: ${srcdir}/ceph_ver.h
- if test "$(DESTDIR)" ; then \
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- options=--install-layout=deb ; \
- else \
- options=--prefix=/usr ; \
-diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am
-index 7dd49333fa..fbb940d07d 100644
---- a/src/pybind/rbd/Makefile.am
-+++ b/src/pybind/rbd/Makefile.am
-@@ -15,7 +15,7 @@ rbd-pybind-clean: ${srcdir}/ceph_ver.h
-
- rbd-pybind-install-exec: ${srcdir}/ceph_ver.h
- if test "$(DESTDIR)" ; then \
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- options=--install-layout=deb ; \
- else \
- options=--prefix=/usr ; \
diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1
deleted file mode 100644
index 3bdb8b485ed..00000000000
--- a/sys-cluster/ceph/files/ceph.confd-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-# Example
-
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
diff --git a/sys-cluster/ceph/files/ceph.confd-r3 b/sys-cluster/ceph/files/ceph.confd-r3
deleted file mode 100644
index 281037c5998..00000000000
--- a/sys-cluster/ceph/files/ceph.confd-r3
+++ /dev/null
@@ -1,63 +0,0 @@
-# /etc/conf.d/ceph: startup configurations for ceph
-
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
-
-# Set ulimits for Ceph services.
-#rc_ulimit="-n 131072 -u 257256"
-
-# the directory under /run to store runtime information in
-#rundir=/run/ceph
-
-# the user and group to run ceph as
-
-# settings for openrc supervisor for various ceph daemons
-#
-# defaults (can be overidden for each daemon)
-# stderr and stdout values get .${id}-std{out,err}.log appended to the provided value
-#
-#respawn_delay=20
-#respawn_max=5
-#respawn_period=1800
-#stdout="/dev/null"
-#stderr="/dev/null"
-
-# radosgw
-#radosgw_respawn_max
-#radosgw_respawn_delay=20
-#radosgw_respawn_period=1800
-#radosgw_stdout="/dev/null"
-#radosgw_stderr="/dev/null"
-
-# mon
-#mon_respawn_max=5
-#mon_respawn_delay=20
-#mon_respawn_period=1800
-#mon_stdout="/dev/null"
-#mon_stderr="/dev/null"
-
-# osd
-#osd_respawn_max=5
-#osd_respawn_delay=30
-#osd_respawn_period=1800
-#osd_stdout="/dev/null"
-#osd_stderr="/dev/null"
-
-# mds
-#mds_respawn_max=5
-#mds_respawn_delay=20
-#mds_respawn_period=1800
-#mds_stdout="/dev/null"
-#mds_stderr="/dev/null"
-
-# mgr
-#mgr_respawn_max=5
-#mgr_respawn_delay=20
-#mgr_respawn_period=1800
-#mgr_stdout="/dev/null"
-#mgr_stderr="/dev/null"
-
-# initd stop timeout.
-#CEPH_TERMTIMEOUT="TERM/120/KILL/5"
-#
-# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r2 b/sys-cluster/ceph/files/ceph.initd-r2
deleted file mode 100644
index 16267c58a13..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-start_stop_daemon_args="--user ceph --group ceph"
-
-depend() {
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- checkpath -d -q -o ceph "$(dirname "${pidfile}")"
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
- fi
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
- eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r7 b/sys-cluster/ceph/files/ceph.initd-r7
deleted file mode 100644
index 110d7bd0b63..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r7
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/var/log/ceph/ceph}
-: ${stderr:=/var/log/ceph/ceph}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- local arg_name arg_val
- for arg_name in std{out,err} respawn_{delay,max,period}; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2020-04-23 17:54 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2020-04-23 17:54 UTC (permalink / raw
To: gentoo-commits
commit: e86cc310b44bae35bdcfa01717f3ca9be198be54
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Apr 22 16:04:05 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 17:54:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86cc310
sys-cluster/ceph: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15471
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ceph/files/ceph-12.2.5-boost-sonames.patch | 165 -----------
.../ceph/files/ceph-13.2.0-boost-sonames.patch | 166 -----------
.../files/ceph-13.2.0-mgr-python-version.patch | 16 -
.../ceph/files/ceph-13.2.0-no-virtualenvs.patch | 78 -----
.../ceph/files/ceph-13.2.5-no-automagic-deps.patch | 37 ---
.../ceph/files/ceph-13.2.6-dpdk-alignment.patch | 14 -
.../ceph/files/ceph-13.2.6-no-virtualenvs.patch | 74 -----
.../ceph/files/ceph-14.2.0-no-virtualenvs.patch | 54 ----
.../ceph-14.2.3-boost-1.6-python-sonames.patch | 26 --
.../ceph/files/ceph-14.2.3-boost-1.70.patch | 78 -----
.../ceph/files/ceph-14.2.3-boost-sonames.patch | 321 ---------------------
sys-cluster/ceph/files/ceph.confd-r4 | 70 -----
sys-cluster/ceph/files/ceph.initd-r11 | 115 --------
sys-cluster/ceph/files/ceph.initd-r9 | 97 -------
14 files changed, 1311 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch
deleted file mode 100644
index 57482b3f27c..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa90ba65da..ea65dd4209 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -567,7 +567,7 @@ set(BOOST_COMPONENTS
- set(BOOST_HEADER_COMPONENTS container)
-
- if(WITH_MGR)
-- list(APPEND BOOST_COMPONENTS python)
-+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
- endif()
- if(WITH_BOOST_CONTEXT)
- list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7aa8a4392e..111f669f2e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -622,13 +622,13 @@ set(ceph_common_objs
- $<TARGET_OBJECTS:crush_objs>)
- set(ceph_common_deps
- json_spirit erasure_code rt ${LIB_RESOLV}
-- Boost::thread
-- Boost::system
-- Boost::regex
-- Boost::random
-- Boost::program_options
-- Boost::date_time
-- Boost::iostreams
-+ boost_thread
-+ boost_system
-+ boost_regex
-+ boost_random
-+ boost_program_options
-+ boost_date_time
-+ boost_iostreams
- ${BLKID_LIBRARIES}
- ${Backtrace_LIBRARIES}
- ${BLKIN_LIBRARIES}
-@@ -712,7 +712,7 @@ if (WITH_MGR)
- $<TARGET_OBJECTS:heap_profiler_objs>)
- target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr osdc client global-static common
-- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-+ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
- install(TARGETS ceph-mgr DESTINATION bin)
- endif (WITH_MGR)
-
-@@ -885,7 +885,7 @@ set(ceph_mds_srcs
- ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
-- Boost::thread)
-+ boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
-
- add_subdirectory(erasure-code)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index f3999e3b01..0ce7fca1ba 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -148,7 +148,7 @@ add_executable(ceph_omapbench
- )
- target_link_libraries(ceph_omapbench
- librados
-- Boost::program_options
-+ boost_program_options
- global
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
-@@ -202,7 +202,7 @@ if(${WITH_RADOSGW})
- cls_rgw_client
- cls_user_client
- cls_lock_client
-- Boost::regex
-+ boost_regex
- ${BLKID_LIBRARIES}
- ${CURL_LIBRARIES}
- ${EXPAT_LIBRARIES}
-@@ -232,7 +232,7 @@ if(${WITH_RADOSGW})
- cls_rgw_client
- cls_user_client
- cls_lock_client
-- Boost::regex
-+ boost_regex
- ${BLKID_LIBRARIES}
- ${CURL_LIBRARIES}
- ${EXPAT_LIBRARIES}
-diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
-index 9fba701e05..da3cbcfe96 100644
---- a/src/test/bench/CMakeLists.txt
-+++ b/src/test/bench/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(smalliobench_srcs
- add_executable(ceph_smalliobench
- ${smalliobench_srcs}
- )
--target_link_libraries(ceph_smalliobench librados Boost::program_options global
-+target_link_libraries(ceph_smalliobench librados boost_program_options global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_smalliobenchrbd
-@@ -27,7 +27,7 @@ if(WITH_RBD)
- librados
- os
- global
-- Boost::program_options
-+ boost_program_options
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
- )
-@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
- add_executable(ceph_smalliobenchfs
- ${ceph_smalliobenchfs_srcs}
- )
--target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_smalliobenchdumb
-@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
- add_executable(ceph_smalliobenchdumb
- ${smalliobenchdumb_srcs}
- )
--target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_tpbench
-@@ -73,7 +73,7 @@ set(tpbench_srcs
- add_executable(ceph_tpbench
- ${tpbench_srcs}
- )
--target_link_libraries(ceph_tpbench librados Boost::program_options global
-+target_link_libraries(ceph_tpbench librados boost_program_options global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- install(TARGETS
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 9f72fa3b48..665c977606 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global)
- install(TARGETS ceph_radosacl DESTINATION bin)
-
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
-
- add_executable(ceph-monstore-tool
- ceph_monstore_tool.cc
- ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- install(PROGRAMS
- ceph-monstore-update-crush.sh
-@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool
- ceph_objectstore_tool.cc
- rebuild_mondb.cc
- RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
- target_link_libraries(ceph-objectstore-tool fuse)
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch b/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch
deleted file mode 100644
index 8de09b91d8a..00000000000
--- a/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f997d03f8..748cb190e6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -591,7 +591,7 @@ set(BOOST_COMPONENTS
- set(BOOST_HEADER_COMPONENTS container)
-
- if(WITH_MGR)
-- list(APPEND BOOST_COMPONENTS python)
-+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
- endif()
- if(WITH_BOOST_CONTEXT)
- list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3d3b4c0919..94ab42ef9f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -630,12 +630,12 @@ set(ceph_common_objs
- $<TARGET_OBJECTS:crush_objs>)
- set(ceph_common_deps
- json_spirit erasure_code ${LIB_RESOLV}
-- Boost::thread
-- Boost::system
-- Boost::random
-- Boost::program_options
-- Boost::date_time
-- Boost::iostreams
-+ boost_thread
-+ boost_system
-+ boost_random
-+ boost_program_options
-+ boost_date_time
-+ boost_iostreams
- ${BLKID_LIBRARIES}
- ${Backtrace_LIBRARIES}
- ${BLKIN_LIBRARIES}
-@@ -759,7 +759,7 @@ if (WITH_MGR)
- $<TARGET_OBJECTS:heap_profiler_objs>)
- target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr osdc client global-static ceph-common
-- Boost::python ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-+ boost_python-${EPYTHON_VERSION} ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
- install(TARGETS ceph-mgr DESTINATION bin)
- endif (WITH_MGR)
-
-@@ -888,7 +888,7 @@ set(ceph_mds_srcs
- ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
-- Boost::thread)
-+ boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
-
- add_subdirectory(erasure-code)
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
- global
- babeltrace
- babeltrace-ctf
-- Boost::date_time
-+ boost_date_time
- )
- install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index c1edd3b882..000c8daaf8 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -162,7 +162,7 @@ target_link_libraries(rgw_a librados cls_otp_client cls_lock_client cls_rgw_clie
-
- if (WITH_RADOSGW_BEAST_FRONTEND)
- target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING)
-- target_link_libraries(rgw_a Boost::coroutine Boost::context)
-+ target_link_libraries(rgw_a boost_coroutine boost_context)
- endif()
-
- if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL))
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index a43335e825..a0d056faaa 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -147,7 +147,7 @@ add_executable(ceph_omapbench
- )
- target_link_libraries(ceph_omapbench
- librados
-- Boost::program_options
-+ boost_program_options
- global
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 4ba31ab2a8..ab66208b57 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
- ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
- DESTINATION bin)
-
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
-
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
- DESTINATION bin)
-
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 1c909ee1ce..7c1ef32df1 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -61,7 +61,7 @@ set_target_properties(ceph_test_rados_api_asio PROPERTIES COMPILE_FLAGS
- target_link_libraries(ceph_test_rados_api_asio global
- librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
-
- # ceph_test_rados_api_list
-@@ -147,7 +147,7 @@ add_executable(ceph_test_rados_api_tier
- set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS
- ${UNITTEST_CXX_FLAGS})
- target_link_libraries(ceph_test_rados_api_tier
-- librados global ${UNITTEST_LIBS} Boost::system radostest)
-+ librados global ${UNITTEST_LIBS} boost_system radostest)
-
- # ceph_test_rados_api_snapshots
- add_executable(ceph_test_rados_api_snapshots
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index e0844ec0c7..886839302c 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -29,20 +29,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
-
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
-
- add_executable(ceph-monstore-tool
- ceph_monstore_tool.cc
- ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
-
- add_executable(ceph-objectstore-tool
- ceph_objectstore_tool.cc
- rebuild_mondb.cc
- RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
- target_link_libraries(ceph-objectstore-tool fuse)
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch b/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch
deleted file mode 100644
index 0dc90ebeaef..00000000000
--- a/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
-index c996cd9402..f99765702b 100644
---- a/src/pybind/CMakeLists.txt
-+++ b/src/pybind/CMakeLists.txt
-@@ -62,11 +62,6 @@ foreach(python_version ${py_vers})
- endforeach()
-
- if(WITH_MGR)
-- if(NOT WITH_PYTHON2 AND MGR_PYTHON_VERSION_MAJOR EQUAL 2)
-- message(FATAL_ERROR "mgr plugins require python2 binding")
-- elseif(NOT WITH_PYTHON3 AND MGR_PYTHON_VERSION_MAJOR EQUAL 3)
-- message(FATAL_ERROR "mgr plugins require python3 binding")
-- endif()
- # Location needs to match default setting for mgr_module_path, currently:
- # OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr")
- install(DIRECTORY
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch
deleted file mode 100644
index 470dbaeb3c0..00000000000
--- a/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt
-index 6e5946b784..233cccfc9b 100644
---- a/src/ceph-detect-init/CMakeLists.txt
-+++ b/src/ceph-detect-init/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua
-
- add_custom_target(ceph-detect-init
- COMMAND
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
-- ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
-+ #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
- COMMENT "ceph-detect-init is being created")
- add_dependencies(tests ceph-detect-init)
-diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt
-index 00aaec4a80..b0700c488f 100644
---- a/src/ceph-disk/CMakeLists.txt
-+++ b/src/ceph-disk/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
-
- add_custom_target(ceph-disk
- COMMAND
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
-- ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
-+ #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
- COMMENT "ceph-disk is being created")
- add_dependencies(tests ceph-disk)
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 2b050f6c6e..e9fb87f76b 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
-
- add_custom_target(mgr-dashboard-test-venv
- COMMAND
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
- COMMENT "dashboard tests virtualenv is being created")
- add_dependencies(tests mgr-dashboard-test-venv)
-@@ -13,9 +13,9 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env)
-
- add_custom_command(
- OUTPUT "${mgr-dashboard-nodeenv}/bin/npm"
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
-- COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0
-+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
-+ #COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
-+ #COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed"
- )
-@@ -27,7 +27,7 @@ add_custom_target(mgr-dashboard-nodeenv
-
- add_custom_command(
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate
-+ #COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate
- DEPENDS frontend/package.json
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
- COMMENT "dashboard frontend dependencies are being installed"
-@@ -62,9 +62,11 @@ else()
- set(npm_command npm run build)
- endif()
-
-+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin)
-+
- add_custom_command(
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate
-+ COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command}
- DEPENDS ${frontend_src} frontend/node_modules
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
- COMMENT "dashboard frontend is being created"
diff --git a/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch b/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch
deleted file mode 100644
index 1eb42b3e5ad..00000000000
--- a/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ceph-13.2.5.orig/src/rocksdb/CMakeLists.txt 2019-03-20 11:39:25.065954652 -0700
-+++ ceph-13.2.5/src/rocksdb/CMakeLists.txt 2019-03-20 13:18:01.548085828 -0700
-@@ -286,18 +286,24 @@
- endif()
- endif()
-
--find_package(NUMA)
--if(NUMA_FOUND)
-- add_definitions(-DNUMA)
-- include_directories(${NUMA_INCLUDE_DIR})
-- list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES})
-+option(WITH_NUMA "build with UBSAN" OFF)
-+if(WITH_NUMA)
-+ find_package(NUMA)
-+ if(NUMA_FOUND)
-+ add_definitions(-DNUMA)
-+ include_directories(${NUMA_INCLUDE_DIR})
-+ list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES})
-+ endif()
- endif()
-
--find_package(TBB)
--if(TBB_FOUND)
-- add_definitions(-DTBB)
-- include_directories(${TBB_INCLUDE_DIR})
-- list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES})
-+option(WITH_TBB "build with UBSAN" OFF)
-+if(WITH_TBB)
-+ find_package(TBB)
-+ if(TBB_FOUND)
-+ add_definitions(-DTBB)
-+ include_directories(${TBB_INCLUDE_DIR})
-+ list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES})
-+ endif()
- endif()
-
- # Used to run CI build and tests so we can run faster
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch b/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch
deleted file mode 100644
index c5d048eb7a2..00000000000
--- a/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/spdk/dpdk/lib/librte_net/rte_ether.h b/src/spdk/dpdk/lib/librte_net/rte_ether.h
-index 3a87ff184..8090b7c01 100644
---- a/src/spdk/dpdk/lib/librte_net/rte_ether.h
-+++ b/src/spdk/dpdk/lib/librte_net/rte_ether.h
-@@ -55,7 +55,8 @@ extern "C" {
- * See http://standards.ieee.org/regauth/groupmac/tutorial.html
- */
- struct ether_addr {
-- uint8_t addr_bytes[ETHER_ADDR_LEN]; /**< Addr bytes in tx order */
-+ /** Addr bytes in tx order */
-+ uint8_t addr_bytes[ETHER_ADDR_LEN] __rte_aligned(2);
- } __attribute__((__packed__));
-
- #define ETHER_LOCAL_ADMIN_ADDR 0x02 /**< Locally assigned Eth. address. */
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch
deleted file mode 100644
index ad38799b690..00000000000
--- a/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt
-index 6e5946b784..233cccfc9b 100644
---- a/src/ceph-detect-init/CMakeLists.txt
-+++ b/src/ceph-detect-init/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua
-
- add_custom_target(ceph-detect-init
- COMMAND
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
-- ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
-+ #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
- COMMENT "ceph-detect-init is being created")
- add_dependencies(tests ceph-detect-init)
-diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt
-index 00aaec4a80..b0700c488f 100644
---- a/src/ceph-disk/CMakeLists.txt
-+++ b/src/ceph-disk/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
-
- add_custom_target(ceph-disk
- COMMAND
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
-- ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
-+ #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
- COMMENT "ceph-disk is being created")
- add_dependencies(tests ceph-disk)
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 88ca8a60bb..77c716cdb1 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
-
- add_custom_target(mgr-dashboard-test-venv
- COMMAND
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
- COMMENT "dashboard tests virtualenv is being created")
- add_dependencies(tests mgr-dashboard-test-venv)
-@@ -13,9 +13,6 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env)
-
- add_custom_command(
- OUTPUT "${mgr-dashboard-nodeenv}/bin/npm"
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
-- COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 10.13.0
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed"
- )
-@@ -27,7 +24,6 @@ add_custom_target(mgr-dashboard-nodeenv
-
- add_custom_command(
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm ci && deactivate
- DEPENDS frontend/package.json
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
- COMMENT "dashboard frontend dependencies are being installed"
-@@ -62,9 +58,11 @@ else()
- set(npm_command npm run build)
- endif()
-
-+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin)
-+
- add_custom_command(
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate
-+ COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command}
- DEPENDS ${frontend_src} frontend/node_modules
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
- COMMENT "dashboard frontend is being created"
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch
deleted file mode 100644
index 5647ac51674..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/.gitignore b/.gitignore
-index 2c2afc282e..80c05ee2f0 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -13,10 +13,8 @@
- *.swp
- *.swo
- *.tmp
--*.orig
- *.patch
- !debian/patches/*.patch
--*.rej
- *.rpm
- *.pyc
- ceph.spec
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 24a2efc9e2..b11d4d0303 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
-
- add_custom_target(mgr-dashboard-test-venv
- COMMAND
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
- COMMENT "dashboard tests virtualenv is being created")
- add_dependencies(tests mgr-dashboard-test-venv)
-@@ -14,9 +14,9 @@ function(add_npm_command)
- set(multi_kw COMMAND DEPENDS)
- cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
- string(REPLACE ";" " " command "${NC_COMMAND}")
-- if(NC_NODEENV)
-- string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-- endif()
-+ #if(NC_NODEENV)
-+ # string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-+ #endif()
- string(REPLACE " " ";" command "${command}")
- add_custom_command(
- OUTPUT "${NC_OUTPUT}"
-@@ -41,9 +41,9 @@ else()
-
- add_custom_command(
- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
-+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed"
- )
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch
deleted file mode 100644
index 860bd9624e8..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 05d1e61270..8b939b8af6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container)
-
- if(WITH_MGR)
- list(APPEND BOOST_COMPONENTS
-- python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
-+ python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
- endif()
- if(WITH_BOOST_CONTEXT)
- list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..3cc6340b2c 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -205,7 +205,7 @@ macro(build_boost version)
- endif()
- add_dependencies(Boost::${c} Boost)
- if(c MATCHES "^python")
-- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
- endif()
- if(Boost_USE_STATIC_LIBS)
- set(Boost_${upper_c}_LIBRARY
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch
deleted file mode 100644
index 26cea1e394b..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
-index e4be074ec7..4af3695dc1 100644
---- a/src/rgw/rgw_asio_frontend.cc
-+++ b/src/rgw/rgw_asio_frontend.cc
-@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO {
- using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>;
-
- template <typename Stream>
--void handle_connection(RGWProcessEnv& env, Stream& stream,
-+void handle_connection(boost::asio::io_context& context,
-+ RGWProcessEnv& env, Stream& stream,
- boost::beast::flat_buffer& buffer, bool is_ssl,
- SharedMutex& pause_mutex,
- rgw::dmclock::Scheduler *scheduler,
-@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream,
- rgw::io::add_conlen_controlling(
- &real_client))));
- RGWRestfulIO client(cct, &real_client_io);
-- auto y = optional_yield{socket.get_io_context(), yield};
-+ auto y = optional_yield{context, yield};
- process_request(env.store, env.rest, &req, env.uri_prefix,
- *env.auth_registry, &client, env.olog, y, scheduler);
- }
-@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
- return;
- }
- buffer.consume(bytes);
-- handle_connection(env, stream, buffer, true, pause_mutex,
-+ handle_connection(context, env, stream, buffer, true, pause_mutex,
- scheduler.get(), ec, yield);
- if (!ec) {
- // ssl shutdown (ignoring errors)
-@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
- auto c = connections.add(conn);
- boost::beast::flat_buffer buffer;
- boost::system::error_code ec;
-- handle_connection(env, s, buffer, false, pause_mutex,
-+ handle_connection(context, env, s, buffer, false, pause_mutex,
- scheduler.get(), ec, yield);
- s.shutdown(tcp::socket::shutdown_both, ec);
- });
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
-index 70487a5253..1d454acd2e 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.h
-+++ b/src/rgw/rgw_dmclock_async_scheduler.h
-@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
- using Completion = async::Completion<Signature, async::AsBase<Request>>;
-
- using Clock = ceph::coarse_real_clock;
-+#if BOOST_VERSION < 107000
- using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+ using Timer = boost::asio::basic_waitable_timer<Clock,
-+ boost::asio::wait_traits<Clock>, executor_type>;
-+#endif
- Timer timer; //< timer for the next scheduled request
-
- CephContext *const cct;
-diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
-index d99a6ff68d..213fc238d2 100644
---- a/src/rgw/rgw_reshard.h
-+++ b/src/rgw/rgw_reshard.h
-@@ -183,7 +183,14 @@ class RGWReshardWait {
- ceph::condition_variable cond;
-
- struct Waiter : boost::intrusive::list_base_hook<> {
-- boost::asio::basic_waitable_timer<Clock> timer;
-+#if BOOST_VERSION < 107000
-+ using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+ using Executor = boost::asio::io_context::executor_type;
-+ using Timer = boost::asio::basic_waitable_timer<Clock,
-+ boost::asio::wait_traits<Clock>, Executor>;
-+#endif
-+ Timer timer;
- explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}
- };
- boost::intrusive::list<Waiter> waiters;
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch
deleted file mode 100644
index 92ca32f5c8e..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index dd08ba5e45..19d3b8ad37 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -1235,10 +1235,10 @@ endif()
- # on all platforms to keep end user code free from platform dependent
- # code. Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
-- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
-- add_library(Boost::disable_autolinking INTERFACE IMPORTED)
-- add_library(Boost::dynamic_linking INTERFACE IMPORTED)
-+if(NOT TARGET boost_diagnostic_definitions)
-+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+ add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+ add_library(boost_dynamic_linking INTERFACE IMPORTED)
- endif()
- if(WIN32)
- # In windows, automatic linking is performed, so you do not have
-@@ -1259,11 +1259,11 @@ if(WIN32)
- # code to emit a #pragma message each time a library is selected
- # for linking.
- set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
-- set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+ set_target_properties(boost_diagnostic_definitions PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
-- set_target_properties(Boost::disable_autolinking PROPERTIES
-+ set_target_properties(boost_disable_autolinking PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
-- set_target_properties(Boost::dynamic_linking PROPERTIES
-+ set_target_properties(boost_dynamic_linking PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
-
-@@ -2088,52 +2088,52 @@ if(Boost_FOUND)
- endif()
-
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- if(Boost_${UPPERCOMPONENT}_FOUND)
- if(Boost_USE_STATIC_LIBS)
-- add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+ add_library(boost_${COMPONENT} STATIC IMPORTED)
- else()
- # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
- # libraries as a result.
-- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+ add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
- endif()
- if(Boost_INCLUDE_DIRS)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(boost_${COMPONENT} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
- IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
- IMPORTED_CONFIGURATIONS RELEASE)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
- IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
- IMPORTED_CONFIGURATIONS DEBUG)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
- IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
- endif()
- if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
- unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
- foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
-- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
- endforeach()
- if(COMPONENT STREQUAL "thread")
- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
- endif()
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(boost_${COMPONENT} PROPERTIES
- INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
- endif()
- if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(boost_${COMPONENT} PROPERTIES
- INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
- endif()
- endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4895e84df6..55814e3b96 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -356,12 +356,12 @@ set(ceph_common_objs
- set(ceph_common_deps
- json_spirit erasure_code arch crc32
- ${LIB_RESOLV}
-- Boost::thread
-- Boost::system
-- Boost::random
-- Boost::program_options
-- Boost::date_time
-- Boost::iostreams
-+ boost_thread
-+ boost_system
-+ boost_random
-+ boost_program_options
-+ boost_date_time
-+ boost_iostreams
- ${BLKID_LIBRARIES}
- ${Backtrace_LIBRARIES}
- ${BLKIN_LIBRARIES}
-@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
- ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
-- Boost::thread)
-+ boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
- endif()
-
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
- PRIVATE
- crc32
- crimson::cflags
-- Boost::iostreams
-- Boost::random
-+ boost_iostreams
-+ boost_random
- ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
-
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 252fb3e5e3..213482da16 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
- osdc client heap_profiler
- global-static ceph-common
-- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
- ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
- global
- babeltrace
- babeltrace-ctf
-- Boost::date_time
-+ boost_date_time
- )
- install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index 8d5b0638a0..a147c55bc3 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -196,7 +196,7 @@ if(WITH_CURL_OPENSSL)
- endif()
-
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
-
- set(rgw_libs rgw_a)
-@@ -347,7 +347,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
- target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
-
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 5dcee1694d..60743be698 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
- )
- target_link_libraries(ceph_omapbench
- librados
-- Boost::program_options
-+ boost_program_options
- global
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
-
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
-
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
- ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
- DESTINATION bin)
-
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
-
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
- DESTINATION bin)
-
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
- librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
-
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
- tier_cxx.cc
- $<TARGET_OBJECTS:unit-main>)
- target_link_libraries(ceph_test_rados_api_tier_pp
-- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
-
- add_executable(ceph_test_rados_api_snapshots
- snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 3988e94bd3..b2a720b8a0 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
- radostest
- radostest-cxx
- librados
-- Boost::thread
-+ boost_thread
- GMock::GMock
- GTest::GTest)
-
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index 36df883a66..43d3456089 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
- if(WITH_BOOST_CONTEXT)
- target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
-- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
-
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
-
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
-
- add_executable(ceph-monstore-tool
- ceph_monstore_tool.cc
- ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
-
- add_executable(ceph-objectstore-tool
- ceph_objectstore_tool.cc
- rebuild_mondb.cc
- RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
- target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph.confd-r4 b/sys-cluster/ceph/files/ceph.confd-r4
deleted file mode 100644
index b8a0c930a49..00000000000
--- a/sys-cluster/ceph/files/ceph.confd-r4
+++ /dev/null
@@ -1,70 +0,0 @@
-# /etc/conf.d/ceph: startup configurations for ceph
-
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
-
-# Set ulimits for Ceph services.
-#rc_ulimit="-n 1048576 -u 1048576"
-
-# the directory under /run to store runtime information in
-#rundir=/run/ceph
-
-# the user and group to run ceph as
-#user="ceph"
-#group="ceph"
-
-# tell openrc to use control groups to make sure everything gets killed
-# properly on stop. Highly reccommended to leave this enabled.
-rc_cgroup_cleanup=1
-
-# settings for openrc supervisor for various ceph daemons
-#
-# defaults (can be overidden for each daemon)
-# stderr and stdout values get .${id}-std{out,err}.log appended
-# to the provided value
-#
-#respawn_delay=20
-#respawn_max=5
-#respawn_period=1800
-#stdout="/dev/null"
-#stderr="/dev/null"
-
-# radosgw
-#radosgw_respawn_max
-#radosgw_respawn_delay=20
-#radosgw_respawn_period=1800
-#radosgw_stdout="/dev/null"
-#radosgw_stderr="/dev/null"
-
-# mon
-#mon_respawn_max=5
-#mon_respawn_delay=20
-#mon_respawn_period=1800
-#mon_stdout="/dev/null"
-#mon_stderr="/dev/null"
-
-# osd
-#osd_respawn_max=5
-#osd_respawn_delay=30
-#osd_respawn_period=1800
-#osd_stdout="/dev/null"
-#osd_stderr="/dev/null"
-
-# mds
-#mds_respawn_max=5
-#mds_respawn_delay=20
-#mds_respawn_period=1800
-#mds_stdout="/dev/null"
-#mds_stderr="/dev/null"
-
-# mgr
-#mgr_respawn_max=5
-#mgr_respawn_delay=20
-#mgr_respawn_period=1800
-#mgr_stdout="/dev/null"
-#mgr_stderr="/dev/null"
-
-# initd stop timeout.
-#CEPH_TERMTIMEOUT="TERM/120/KILL/5"
-#
-# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r11 b/sys-cluster/ceph/files/ceph.initd-r11
deleted file mode 100644
index 23827e1a562..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r11
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/sbin/openrc-run
-
-# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
-_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
-if [ -r "${_CONFD_FILE}" ]; then
- . "${_CONFD_FILE}" || exit 1
-fi
-
-: "${ceph_conf:=/etc/ceph/ceph.conf}"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: "${rundir:=/run/ceph}"
-: "${user:=ceph}"
-: "${group:=ceph}"
-: "${rc_ulimit:=-n 1048576 -u 1048576}"
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-extra_commands="reload"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: "${supervisor:=supervise-daemon}"
-: "${stdout:=/var/log/ceph/ceph}"
-: "${stderr:=/var/log/ceph/ceph}"
-: "${respawn_delay:=10}"
-: "${respawn_max:=5}"
-: "${respawn_period:=1800}"
-
-: "${osd_respawn_delay:=15}"
-: "{osd_respawn_max:=10}"
-
-: "{radosgw_respawn_max:=5}"
-: "${radosgw_respawn_period:=30}"
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- local log_dir
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- if [ -n "${bluestore_osd_fsid}" ]; then
- einfo "Mounting Bluestore"
- ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
- fi
-
- if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
- command_args="${command_args} --name client.${daemon_id}"
- fi
-
- local arg_name arg_val repl_arg_name
- for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- local log_file log_postfix
- log_postfix=".${daemon_id}-${arg_name}.log"
- log_file="${arg_val}"
-
- if [ "${log_file}" != /dev/null ]; then
- log_file="${log_file}${log_postfix}"
-
- log_dir="$(dirname "${log_file}")"
- checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
- fi
-
- repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
- supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r9 b/sys-cluster/ceph/files/ceph.initd-r9
deleted file mode 100644
index cfbd58e4b57..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r9
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/var/log/ceph/ceph}
-: ${stderr:=/var/log/ceph/ceph}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- local arg_name arg_val
- for arg_name in std{out,err} respawn_{delay,max,period}; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- local log_file log_postfix
- log_postfix=".${daemon_id}-${arg_name}.log"
- log_file="${arg_val}"
-
- if [ "${log_file}" != /dev/null ]; then
- log_file="${log_file}${log_postfix}"
- fi
-
- checkpath -m 0755 -o "${user}:${group}" -d $(dirname "${log_file}")
-
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2020-06-27 20:51 Aaron Bauman
0 siblings, 0 replies; 27+ messages in thread
From: Aaron Bauman @ 2020-06-27 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 8fdd0419a4c6fdcc82a4342601aaa7e7061220c7
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 27 17:38:25 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 20:47:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fdd0419
sys-cluster/ceph: remove unused patches
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16451
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../ceph-14.2.5-boost-1.6-python-sonames.patch | 26 --
.../ceph/files/ceph-14.2.5-boost-sonames.patch | 471 ---------------------
2 files changed, 497 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch
deleted file mode 100644
index 318844f6c02..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e9ebfbb41..1a858a6e3f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -649,7 +649,7 @@ set(BOOST_HEADER_COMPONENTS container)
-
- if(WITH_MGR)
- list(APPEND BOOST_COMPONENTS
-- python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
-+ python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
- endif()
- if(WITH_BOOST_CONTEXT)
- list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..3cc6340b2c 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -205,7 +205,7 @@ macro(build_boost version)
- endif()
- add_dependencies(Boost::${c} Boost)
- if(c MATCHES "^python")
-- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
- endif()
- if(Boost_USE_STATIC_LIBS)
- set(Boost_${upper_c}_LIBRARY
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch
deleted file mode 100644
index d8c26bcdfe2..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch
+++ /dev/null
@@ -1,471 +0,0 @@
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..39bb081b1b 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -199,13 +199,13 @@ macro(build_boost version)
- foreach(c ${Boost_BUILD_COMPONENTS})
- string(TOUPPER ${c} upper_c)
- if(Boost_USE_STATIC_LIBS)
-- add_library(Boost::${c} STATIC IMPORTED)
-+ add_library(Boost_${c} STATIC IMPORTED)
- else()
-- add_library(Boost::${c} SHARED IMPORTED)
-+ add_library(Boost_${c} SHARED IMPORTED)
- endif()
-- add_dependencies(Boost::${c} Boost)
-+ add_dependencies(Boost_${c} Boost)
- if(c MATCHES "^python")
-- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
- endif()
- if(Boost_USE_STATIC_LIBS)
- set(Boost_${upper_c}_LIBRARY
-@@ -215,7 +215,7 @@ macro(build_boost version)
- ${install_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}boost_${c}${CMAKE_SHARED_LIBRARY_SUFFIX})
- endif()
- unset(buildid)
-- set_target_properties(Boost::${c} PROPERTIES
-+ set_target_properties(Boost_${c} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
- IMPORTED_LOCATION "${Boost_${upper_c}_LIBRARY}")
-@@ -224,19 +224,19 @@ macro(build_boost version)
- foreach(c ${Boost_BUILD_COMPONENTS})
- if(Boost_${c}_DEPENDENCIES)
- foreach(dep ${Boost_${c}_DEPENDENCIES})
-- list(APPEND dependencies Boost::${dep})
-+ list(APPEND dependencies Boost_${dep})
- endforeach()
-- set_target_properties(Boost::${c} PROPERTIES
-+ set_target_properties(Boost_${c} PROPERTIES
- INTERFACE_LINK_LIBRARIES "${dependencies}")
- unset(dependencies)
- endif()
- endforeach()
-
- # for header-only libraries
-- add_library(Boost::boost INTERFACE IMPORTED)
-- set_target_properties(Boost::boost PROPERTIES
-+ add_library(Boost_boost INTERFACE IMPORTED)
-+ set_target_properties(Boost_boost PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-- add_dependencies(Boost::boost Boost)
-+ add_dependencies(Boost_boost Boost)
- find_package_handle_standard_args(Boost DEFAULT_MSG
- Boost_INCLUDE_DIRS Boost_LIBRARIES)
- mark_as_advanced(Boost_LIBRARIES BOOST_INCLUDE_DIRS)
-@@ -253,7 +253,7 @@ function(maybe_add_boost_dep target)
- get_filename_component(ext ${src} EXT)
- # assuming all cxx source files include boost header(s)
- if(ext MATCHES ".cc|.cpp|.cxx")
-- add_dependencies(${target} Boost::boost)
-+ add_dependencies(${target} Boost_boost)
- return()
- endif()
- endforeach()
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index e2525b8934..e728e5a9d2 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -340,10 +340,6 @@ macro(_Boost_ADJUST_LIB_VARS basename)
-
- if(Boost_${basename}_LIBRARY AND Boost_${basename}_HEADER)
- set(Boost_${basename}_FOUND ON)
-- if("x${basename}" STREQUAL "xTHREAD" AND NOT TARGET Threads::Threads)
-- string(APPEND Boost_ERROR_REASON_THREAD " (missing dependency: Threads)")
-- set(Boost_THREAD_FOUND OFF)
-- endif()
- endif()
-
- endif()
-@@ -919,7 +915,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
- if (NOT _boost_DEPS_STRING)
- set(_boost_DEPS_STRING "(none)")
- endif()
-- # message(STATUS "Dependencies for Boost::${component}: ${_boost_DEPS_STRING}")
-+ # message(STATUS "Dependencies for Boost_${component}: ${_boost_DEPS_STRING}")
- endfunction()
-
- #
-@@ -1003,7 +999,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
- if (NOT _boost_HDRS_STRING)
- set(_boost_HDRS_STRING "(none)")
- endif()
-- # message(STATUS "Headers for Boost::${component}: ${_boost_HDRS_STRING}")
-+ # message(STATUS "Headers for Boost_${component}: ${_boost_HDRS_STRING}")
- endfunction()
-
- #
-@@ -1051,7 +1047,7 @@ endfunction()
-
- #
- # Some boost libraries may require particular set of compler features.
--# The very first one was `boost::fiber` introduced in Boost 1.62.
-+# The very first one was `boost_fiber` introduced in Boost 1.62.
- # One can check required compiler features of it in
- # - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`;
- # - `${Boost_ROOT}/libs/context/build/Jamfile.v2`.
-@@ -1178,7 +1174,7 @@ else()
- # _Boost_COMPONENT_HEADERS. See the instructions at the top of
- # _Boost_COMPONENT_DEPENDENCIES.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-- "1.70.0" "1.70" "1.69.0" "1.69"
-+ "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
- "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
- "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
- "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
-@@ -1235,10 +1231,10 @@ endif()
- # on all platforms to keep end user code free from platform dependent
- # code. Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
-- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
-- add_library(Boost::disable_autolinking INTERFACE IMPORTED)
-- add_library(Boost::dynamic_linking INTERFACE IMPORTED)
-+if(NOT TARGET boost_diagnostic_definitions)
-+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+ add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+ add_library(boost_dynamic_linking INTERFACE IMPORTED)
- endif()
- if(WIN32)
- # In windows, automatic linking is performed, so you do not have
-@@ -1259,11 +1255,11 @@ if(WIN32)
- # code to emit a #pragma message each time a library is selected
- # for linking.
- set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
-- set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+ set_target_properties(boost_diagnostic_definitions PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
-- set_target_properties(Boost::disable_autolinking PROPERTIES
-+ set_target_properties(boost_disable_autolinking PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
-- set_target_properties(Boost::dynamic_linking PROPERTIES
-+ set_target_properties(boost_dynamic_linking PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
-
-@@ -1738,7 +1734,7 @@ if("thread" IN_LIST Boost_FIND_COMPONENTS)
- else()
- set(_Boost_find_quiet "")
- endif()
-- find_package(Threads ${_Boost_find_quiet})
-+ find_package(boost_thread ${_Boost_find_quiet})
- unset(_Boost_find_quiet)
- endif()
-
-@@ -2079,61 +2075,61 @@ endif()
-
- if(Boost_FOUND)
- # For header-only libraries
-- if(NOT TARGET Boost::boost)
-- add_library(Boost::boost INTERFACE IMPORTED)
-+ if(NOT TARGET Boost_boost)
-+ add_library(Boost_boost INTERFACE IMPORTED)
- if(Boost_INCLUDE_DIRS)
-- set_target_properties(Boost::boost PROPERTIES
-+ set_target_properties(Boost_boost PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
- endif()
- endif()
-
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost_${COMPONENT})
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- if(Boost_${UPPERCOMPONENT}_FOUND)
- if(Boost_USE_STATIC_LIBS)
-- add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+ add_library(Boost_${COMPONENT} STATIC IMPORTED)
- else()
- # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
- # libraries as a result.
-- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+ add_library(Boost_${COMPONENT} UNKNOWN IMPORTED)
- endif()
- if(Boost_INCLUDE_DIRS)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
- IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+ set_property(TARGET Boost_${COMPONENT} APPEND PROPERTY
- IMPORTED_CONFIGURATIONS RELEASE)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
- IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+ set_property(TARGET Boost_${COMPONENT} APPEND PROPERTY
- IMPORTED_CONFIGURATIONS DEBUG)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
- IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
- endif()
- if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
- unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
- foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
-- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost_${dep})
- endforeach()
- if(COMPONENT STREQUAL "thread")
-- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
-+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_thread)
- endif()
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
- endif()
- if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- CXX_STANDARD 17)
- endif()
- endif()
-diff --git a/cmake/modules/Finddpdk.cmake b/cmake/modules/Finddpdk.cmake
-index 964ae5dfb0..92bf07c14e 100644
---- a/cmake/modules/Finddpdk.cmake
-+++ b/cmake/modules/Finddpdk.cmake
-@@ -102,9 +102,9 @@ if(dpdk_FOUND)
-
- if(NOT TARGET dpdk::dpdk)
- add_library(dpdk::dpdk INTERFACE IMPORTED)
-- find_package(Threads QUIET)
-+ find_package(boost_thread QUIET)
- list(APPEND dpdk_LIBRARIES
-- Threads::Threads
-+ boost_thread
- dpdk::cflags)
- set_target_properties(dpdk::dpdk PROPERTIES
- INTERFACE_LINK_LIBRARIES "${dpdk_LIBRARIES}"
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 28ec9835f8..31a1efa19f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -356,12 +356,12 @@ set(ceph_common_objs
- set(ceph_common_deps
- json_spirit erasure_code arch crc32
- ${LIB_RESOLV}
-- Boost::thread
-- Boost::system
-- Boost::random
-- Boost::program_options
-- Boost::date_time
-- Boost::iostreams
-+ boost_thread
-+ boost_system
-+ boost_random
-+ boost_program_options
-+ boost_date_time
-+ boost_iostreams
- ${BLKID_LIBRARIES}
- ${Backtrace_LIBRARIES}
- ${BLKIN_LIBRARIES}
-@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
- ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
-- Boost::thread)
-+ boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
- endif()
-
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
- PRIVATE
- crc32
- crimson::cflags
-- Boost::iostreams
-- Boost::random
-+ boost_iostreams
-+ boost_random
- ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
-
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 252fb3e5e3..213482da16 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
- osdc client heap_profiler
- global-static ceph-common
-- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
- ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
- global
- babeltrace
- babeltrace-ctf
-- Boost::date_time
-+ boost_date_time
- )
- install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index 82f5181f5b..8a51f140fb 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -202,7 +202,7 @@ if(WITH_CURL_OPENSSL)
- endif()
-
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
-
- set(rgw_libs rgw_a)
-@@ -353,7 +353,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
- target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
-
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 5dcee1694d..60743be698 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
- )
- target_link_libraries(ceph_omapbench
- librados
-- Boost::program_options
-+ boost_program_options
- global
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
-
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
-
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
- ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
- DESTINATION bin)
-
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
-
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
- DESTINATION bin)
-
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
- librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
-
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
- tier_cxx.cc
- $<TARGET_OBJECTS:unit-main>)
- target_link_libraries(ceph_test_rados_api_tier_pp
-- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
-
- add_executable(ceph_test_rados_api_snapshots
- snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 3c3e9db6c1..2c208c1a4f 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
- radostest
- radostest-cxx
- librados
-- Boost::thread
-+ boost_thread
- GMock::GMock
- GTest::GTest)
-
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index cde6348d57..e6ce738834 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
- if(WITH_BOOST_CONTEXT)
- target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
-- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
-
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
-
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
-
- add_executable(ceph-monstore-tool
- ceph_monstore_tool.cc
- ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
-
- add_executable(ceph-objectstore-tool
- ceph_objectstore_tool.cc
- rebuild_mondb.cc
- RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
- target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
- endif(WITH_FUSE)
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2021-02-04 19:59 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2021-02-04 19:59 UTC (permalink / raw
To: gentoo-commits
commit: c10ad4deaf8dd2fcc754924e7a19079edc6ce675
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Feb 4 17:53:40 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Feb 4 19:58:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10ad4de
sys-cluster/ceph: remove unused patch
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19324
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ceph/files/ceph-15.2.5-systemd-unit-fix.patch | 27 ----------------------
1 file changed, 27 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch
deleted file mode 100644
index a127ada181f..00000000000
--- a/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bd8b8540f6b67a25585ca9cf140d6de760bc2a43 Mon Sep 17 00:00:00 2001
-From: Jan Fajerski <jfajerski@suse.com>
-Date: Fri, 12 Jun 2020 09:27:36 +0200
-Subject: [PATCH] systemd/ceph-osd: ceph-osd-prestart.sh now lives in
- /usr/libexec
-
-Fixes: https://tracker.ceph.com/issues/45984
-Fixes: ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29
-
-Signed-off-by: Jan Fajerski <jfajerski@suse.com>
----
- systemd/ceph-osd@.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
-index a0067d347220..4a2254e99478 100644
---- a/systemd/ceph-osd@.service.in
-+++ b/systemd/ceph-osd@.service.in
-@@ -9,7 +9,7 @@ Environment=CLUSTER=ceph
- EnvironmentFile=-@SYSTEMD_ENV_FILE@
- Environment=CLUSTER=ceph
- ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
--ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
-+ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
- ExecReload=/bin/kill -HUP $MAINPID
- LockPersonality=true
- MemoryDenyWriteExecute=true
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2021-03-01 22:11 Conrad Kostecki
0 siblings, 0 replies; 27+ messages in thread
From: Conrad Kostecki @ 2021-03-01 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 874716673a6525e77bc1585efc581876e18d08dc
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 28 12:18:22 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 22:11:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87471667
sys-cluster/ceph: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/19710
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../ceph/files/ceph-14.2.10-missing-includes.patch | 26 ------------------
.../ceph/files/ceph-14.2.10-python-warnings.patch | 31 ----------------------
2 files changed, 57 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
deleted file mode 100644
index aaa6ee080a3..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/common/bit_str.h b/src/common/bit_str.h
-index c4c24f6a75..b5631e8b84 100644
---- a/src/common/bit_str.h
-+++ b/src/common/bit_str.h
-@@ -14,6 +14,8 @@
- #ifndef CEPH_COMMON_BIT_STR_H
- #define CEPH_COMMON_BIT_STR_H
-
-+#include <cstdint>
-+#include <iosfwd>
- #include <functional>
-
- namespace ceph {
-diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
-index 977ce3638d..8d982879aa 100644
---- a/src/librbd/api/PoolMetadata.h
-+++ b/src/librbd/api/PoolMetadata.h
-@@ -8,6 +8,8 @@
- #include "include/rados/librados_fwd.hpp"
-
- #include <map>
-+#include <string>
-+#include <cstdint>
-
- namespace librbd {
-
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch b/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch
deleted file mode 100644
index 8be3e509a1c..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
-index 7d7e5b49e4..9a1ba80e69 100644
---- a/src/pybind/ceph_volume_client.py
-+++ b/src/pybind/ceph_volume_client.py
-@@ -355,7 +355,7 @@ class CephFSVolumeClient(object):
- continue
-
- (group_id, volume_id) = volume.split('/')
-- group_id = group_id if group_id is not 'None' else None
-+ group_id = group_id if group_id != 'None' else None
- volume_path = VolumePath(group_id, volume_id)
- access_level = volume_data['access_level']
-
-@@ -378,7 +378,7 @@ class CephFSVolumeClient(object):
- if vol_meta['auths'][auth_id] == want_auth:
- continue
-
-- readonly = True if access_level is 'r' else False
-+ readonly = True if access_level == 'r' else False
- self._authorize_volume(volume_path, auth_id, readonly)
-
- # Recovered from partial auth updates for the auth ID's access
-@@ -1120,7 +1120,7 @@ class CephFSVolumeClient(object):
-
- # Construct auth caps that if present might conflict with the desired
- # auth caps.
-- unwanted_access_level = 'r' if want_access_level is 'rw' else 'rw'
-+ unwanted_access_level = 'r' if want_access_level == 'rw' else 'rw'
- unwanted_mds_cap = 'allow {0} path={1}'.format(unwanted_access_level, path)
- if namespace:
- unwanted_osd_cap = 'allow {0} pool={1} namespace={2}'.format(
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2021-03-26 18:32 Conrad Kostecki
0 siblings, 0 replies; 27+ messages in thread
From: Conrad Kostecki @ 2021-03-26 18:32 UTC (permalink / raw
To: gentoo-commits
commit: fce4ff18df23777f7cd27d70e3388eb872f2e231
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 18:28:19 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 18:32:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce4ff18
sys-cluster/ceph: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/20132
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
deleted file mode 100644
index f8f7fad8b65..00000000000
--- a/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NaurBwdp a/src/global/signal_handler.h src/global/b/signal_handler.h
---- a/src/global/signal_handler.h 2020-10-01 03:15:48.208164979 +0700
-+++ b/src/global/signal_handler.h 2020-10-01 03:15:40.655244081 +0700
-@@ -20,11 +20,7 @@
-
- typedef void (*signal_handler_t)(int);
-
--#ifndef HAVE_REENTRANT_STRSIGNAL
--# define sig_str(signum) sys_siglist[signum]
--#else
- # define sig_str(signum) strsignal(signum)
--#endif
-
- void install_sighandler(int signum, signal_handler_t handler, int flags);
-
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2021-05-27 20:56 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2021-05-27 20:56 UTC (permalink / raw
To: gentoo-commits
commit: e6e503fe8c443d3c6f143a54a7a025dd4c2677eb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu May 27 19:05:35 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu May 27 20:56:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6e503fe
sys-cluster/ceph: remove unused patch
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/21013
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ceph/files/ceph-16.2.0-no-virtualenvs.patch | 74 ----------------------
1 file changed, 74 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch
deleted file mode 100644
index d8acd4355b5..00000000000
--- a/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
-index 2c8fdb0b93..07d52b3d67 100644
---- a/cmake/modules/AddCephTest.cmake
-+++ b/cmake/modules/AddCephTest.cmake
-@@ -70,14 +70,6 @@ function(add_tox_test name)
- endif()
- string(REPLACE ";" "," tox_envs "${tox_envs}")
- find_package(Python3 QUIET REQUIRED)
-- add_custom_command(
-- OUTPUT ${venv_path}/bin/activate
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path}
-- WORKING_DIRECTORY ${tox_path}
-- COMMENT "preparing venv for ${name}")
-- add_custom_target(${name}-venv
-- DEPENDS ${venv_path}/bin/activate)
-- add_dependencies(tests ${name}-venv)
- add_test(
- NAME ${test_name}
- COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
-diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
-index 4224499c47..9a6c87595b 100644
---- a/src/ceph-volume/CMakeLists.txt
-+++ b/src/ceph-volume/CMakeLists.txt
-@@ -8,22 +8,6 @@ if(FREEBSD)
- add_subdirectory(plugin/zfs)
- endif()
-
--# Required for running ceph-volume inventory in a vstart environment
--set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "ceph-volume venv is being created")
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
-- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
--
- add_custom_target(ceph-volume-venv-setup
- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
-
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 59c28a33f6..7f63e2adf4 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -5,9 +5,6 @@ function(add_npm_command)
- set(multi_kw COMMAND DEPENDS)
- cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
- string(REPLACE ";" " " command "${NC_COMMAND}")
-- if(NC_NODEENV)
-- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-- endif()
- string(REPLACE " " ";" command "${command}")
- add_custom_command(
- OUTPUT "${NC_OUTPUT}"
-@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM)
- set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}")
- endif()
- add_custom_command(
-- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv ${node_mirror_opt} -p --node=12.18.2
-- COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
-+ OUTPUT "/bin/npm"
-+ COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed"
- )
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2021-10-26 17:49 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2021-10-26 17:49 UTC (permalink / raw
To: gentoo-commits
commit: df0ed7469531e64f44cd332ca179e72acf0ef402
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Oct 26 10:10:51 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 17:49:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0ed746
sys-cluster/ceph: remove unused patches
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22710
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../files/ceph-14.2.10-build-without-mgr.patch | 111 ---------------------
.../ceph/files/ceph-14.2.5-no-virtualenvs.patch | 39 --------
.../ceph/files/ceph-15.2.0-no-virtualenvs.patch | 73 --------------
.../ceph/files/ceph-15.2.5-missing-includes.patch | 12 ---
4 files changed, 235 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch b/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch
deleted file mode 100644
index 0742945c018..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-commit 41c1cee88b38bc43002b232ede42dc157364f61a
-Author: Casey Bodley <cbodley@redhat.com>
-Date: Fri Nov 1 16:04:37 2019 -0400
-
- cmake: define mgr_cap_obj library when WITH_MGR=OFF
-
- resolves the cmake error when WITH_MGR=OFF:
-
- Error evaluating generator expression:
-
- $<TARGET_OBJECTS:mgr_cap_obj>
-
- Objects of target "mgr_cap_obj" referenced but no such target exists.
- Call Stack (most recent call first):
- src/mon/CMakeLists.txt:34 (add_library)
-
- Signed-off-by: Casey Bodley <cbodley@redhat.com>
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 275a8ebd17..c2a9d7a669 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -473,9 +473,7 @@ if(WITH_LIBRADOSSTRIPER)
- add_subdirectory(libradosstriper)
- endif()
-
--if(WITH_MGR)
-- add_subdirectory(mgr)
--endif()
-+add_subdirectory(mgr)
-
- set(librados_config_srcs
- librados-config.cc)
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 79227bcc1d..e69335eb69 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -1,37 +1,39 @@
- add_library(mgr_cap_obj OBJECT
- MgrCap.cc)
-
--set(mgr_srcs
-- ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc
-- ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc
-- ActivePyModule.cc
-- ActivePyModules.cc
-- BaseMgrModule.cc
-- BaseMgrStandbyModule.cc
-- ClusterState.cc
-- DaemonHealthMetricCollector.cc
-- DaemonServer.cc
-- DaemonState.cc
-- Gil.cc
-- Mgr.cc
-- MgrStandby.cc
-- OSDPerfMetricTypes.cc
-- OSDPerfMetricCollector.cc
-- PyFormatter.cc
-- PyModule.cc
-- PyModuleRegistry.cc
-- PyModuleRunner.cc
-- PyOSDMap.cc
-- StandbyPyModules.cc
-- mgr_commands.cc
-- $<TARGET_OBJECTS:mgr_cap_obj>)
--add_executable(ceph-mgr ${mgr_srcs})
--target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
--target_link_libraries(ceph-mgr
-- osdc client heap_profiler
-- global-static ceph-common
-- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-- ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
--set_target_properties(ceph-mgr PROPERTIES
-- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
--install(TARGETS ceph-mgr DESTINATION bin)
-+if(WITH_MGR)
-+ set(mgr_srcs
-+ ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc
-+ ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc
-+ ActivePyModule.cc
-+ ActivePyModules.cc
-+ BaseMgrModule.cc
-+ BaseMgrStandbyModule.cc
-+ ClusterState.cc
-+ DaemonHealthMetricCollector.cc
-+ DaemonServer.cc
-+ DaemonState.cc
-+ Gil.cc
-+ Mgr.cc
-+ MgrStandby.cc
-+ OSDPerfMetricTypes.cc
-+ OSDPerfMetricCollector.cc
-+ PyFormatter.cc
-+ PyModule.cc
-+ PyModuleRegistry.cc
-+ PyModuleRunner.cc
-+ PyOSDMap.cc
-+ StandbyPyModules.cc
-+ mgr_commands.cc
-+ $<TARGET_OBJECTS:mgr_cap_obj>)
-+ add_executable(ceph-mgr ${mgr_srcs})
-+ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
-+ target_link_libraries(ceph-mgr
-+ osdc client heap_profiler
-+ global-static ceph-common
-+ Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+ ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
-+ set_target_properties(ceph-mgr PROPERTIES
-+ POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-+ install(TARGETS ceph-mgr DESTINATION bin)
-+endif()
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-14.2.5-no-virtualenvs.patch
deleted file mode 100644
index 5b7cb41c87a..00000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-no-virtualenvs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index b6c7861838..8ce95a93a5 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
-
- add_custom_target(mgr-dashboard-test-venv
- COMMAND
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
- COMMENT "dashboard tests virtualenv is being created")
- add_dependencies(tests mgr-dashboard-test-venv)
-@@ -14,9 +14,9 @@ function(add_npm_command)
- set(multi_kw COMMAND DEPENDS)
- cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
- string(REPLACE ";" " " command "${NC_COMMAND}")
-- if(NC_NODEENV)
-- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-- endif()
-+ #if(NC_NODEENV)
-+ # string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-+ #endif()
- string(REPLACE " " ";" command "${command}")
- add_custom_command(
- OUTPUT "${NC_OUTPUT}"
-@@ -41,9 +41,9 @@ else()
-
- add_custom_command(
- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
-+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed"
- )
diff --git a/sys-cluster/ceph/files/ceph-15.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-15.2.0-no-virtualenvs.patch
deleted file mode 100644
index 097639c1bb7..00000000000
--- a/sys-cluster/ceph/files/ceph-15.2.0-no-virtualenvs.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
-index c9ee8c1b8f..09f75543da 100644
---- a/cmake/modules/AddCephTest.cmake
-+++ b/cmake/modules/AddCephTest.cmake
-@@ -68,14 +68,6 @@ function(add_tox_test name)
- endif()
- string(REPLACE ";" "," tox_envs "${tox_envs}")
- find_package(Python3 QUIET REQUIRED)
-- add_custom_command(
-- OUTPUT ${venv_path}/bin/activate
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path}
-- WORKING_DIRECTORY ${tox_path}
-- COMMENT "preparing venv for ${name}")
-- add_custom_target(${name}-venv
-- DEPENDS ${venv_path}/bin/activate)
-- add_dependencies(tests ${name}-venv)
- add_test(
- NAME ${test_name}
- COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
-diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
-index 4224499c47..9a6c87595b 100644
---- a/src/ceph-volume/CMakeLists.txt
-+++ b/src/ceph-volume/CMakeLists.txt
-@@ -8,22 +8,6 @@ if(FREEBSD)
- add_subdirectory(plugin/zfs)
- endif()
-
--# Required for running ceph-volume inventory in a vstart environment
--set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "ceph-volume venv is being created")
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
-- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
--
- add_custom_target(ceph-volume-venv-setup
- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
-
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 9a8a03f0a8..8fbf65988e 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -5,9 +5,6 @@ function(add_npm_command)
- set(multi_kw COMMAND DEPENDS)
- cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
- string(REPLACE ";" " " command "${NC_COMMAND}")
-- if(NC_NODEENV)
-- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-- endif()
- string(REPLACE " " ";" command "${command}")
- add_custom_command(
- OUTPUT "${NC_OUTPUT}"
-@@ -29,10 +26,8 @@ else()
- set(nodeenv NODEENV)
-
- add_custom_command(
-- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.18.1
-+ OUTPUT "/bin/npm"
-+ COMMAND /bin/nodeenv -p --node=10.18.1
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed"
- )
diff --git a/sys-cluster/ceph/files/ceph-15.2.5-missing-includes.patch b/sys-cluster/ceph/files/ceph-15.2.5-missing-includes.patch
deleted file mode 100644
index 5f4ed843ddc..00000000000
--- a/sys-cluster/ceph/files/ceph-15.2.5-missing-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/tools/rbd/action/Bench.cc b/src/tools/rbd/action/Bench.cc
-index aa6edbc18b..90c551c179 100644
---- a/src/tools/rbd/action/Bench.cc
-+++ b/src/tools/rbd/action/Bench.cc
-@@ -9,6 +9,7 @@
- #include "common/ceph_mutex.h"
- #include "include/types.h"
- #include "global/signal_handler.h"
-+#include <atomic>
- #include <iostream>
- #include <boost/accumulators/accumulators.hpp>
- #include <boost/accumulators/statistics/stats.hpp>
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2022-03-12 18:45 David Seifert
0 siblings, 0 replies; 27+ messages in thread
From: David Seifert @ 2022-03-12 18:45 UTC (permalink / raw
To: gentoo-commits
commit: 23d4106594f2b6678ea98da3ccba64f5eb44c44b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Mar 12 18:45:04 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 18:45:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d41065
sys-cluster/ceph: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/24407
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../ceph/files/ceph-14.2.0-link-crc32-statically.patch | 11 -----------
sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch | 12 ------------
2 files changed, 23 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch b/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch
deleted file mode 100644
index ec7a4fb079b3..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ceph-14.2.0.orig/src/common/CMakeLists.txt 2019-03-18 04:08:29.000000000 -0600
-+++ ceph-14.2.0/src/common/CMakeLists.txt 2019-03-21 18:42:32.903182824 -0600
-@@ -165,7 +165,7 @@
- crc32c_aarch64.c)
- endif(HAVE_INTEL)
-
--add_library(crc32 ${crc32_srcs})
-+add_library(crc32 STATIC ${crc32_srcs})
- if(HAVE_ARMV8_CRC)
- set_target_properties(crc32 PROPERTIES
- COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch b/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch
deleted file mode 100644
index 309e00d226dd..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt
-index b424482dee..dc4f9b82ae 100644
---- a/src/blk/CMakeLists.txt
-+++ b/src/blk/CMakeLists.txt
-@@ -26,6 +26,7 @@ if(WITH_ZBD)
- endif()
-
- add_library(blk ${libblk_srcs})
-+install(TARGETS blk DESTINATION ${CMAKE_INSTALL_LIBDIR})
- target_include_directories(blk PRIVATE "./")
-
- if(HAVE_LIBAIO)
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2022-05-05 22:51 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2022-05-05 22:51 UTC (permalink / raw
To: gentoo-commits
commit: ad20f0bba7a59b6854685f0f8170074235396377
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu May 5 18:27:35 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu May 5 22:51:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad20f0bb
sys-cluster/ceph: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25335
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ceph/files/ceph-17.2.0-boost-1.74.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-boost-1.74.patch b/sys-cluster/ceph/files/ceph-17.2.0-boost-1.74.patch
deleted file mode 100644
index 8fa7330520d8..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.0-boost-1.74.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 722b4303b1986ce93744af5baeecde7681d8e347 Mon Sep 17 00:00:00 2001
-From: Casey Bodley <cbodley@redhat.com>
-Date: Mon, 25 Jan 2021 13:08:35 -0500
-Subject: [PATCH] cmake: boost>=1.74 adds BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
- to radosgw
-
-Fixes: https://tracker.ceph.com/issues/48988
-
-Signed-off-by: Casey Bodley <cbodley@redhat.com>
----
- src/rgw/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index 1b8cb81b8f2c1..12b42e4077f5a 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -1,3 +1,7 @@
-+if(Boost_VERSION VERSION_GREATER_EQUAL 1.74)
-+ add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
-+endif()
-+
- add_custom_target(civetweb_h
- COMMAND ${CMAKE_COMMAND} -E make_directory
- "${CMAKE_BINARY_DIR}/src/include/civetweb"
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2022-07-18 17:33 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2022-07-18 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 3371e9a6d16a8f87ee52edd62dd3b80d866ad12b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jul 15 18:36:33 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 17:28:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3371e9a6
sys-cluster/ceph: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26427
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ceph/files/ceph-17.2.0-no-virtualenvs.patch | 68 ----------------------
1 file changed, 68 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch
deleted file mode 100644
index 930dd08e8630..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
-index 0df7125b508..01afc88289c 100644
---- a/cmake/modules/AddCephTest.cmake
-+++ b/cmake/modules/AddCephTest.cmake
-@@ -57,7 +57,6 @@ endfunction()
-
- function(add_tox_test name)
- set(test_name run-tox-${name})
-- set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv)
- cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN})
- if(DEFINED TOXTEST_TOX_PATH)
- set(tox_path ${TOXTEST_TOX_PATH})
-@@ -71,27 +70,13 @@ function(add_tox_test name)
- endif()
- string(REPLACE ";" "," tox_envs "${tox_envs}")
- find_package(Python3 QUIET REQUIRED)
-- add_test(
-- NAME setup-venv-for-${name}
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${venv_path}
-- WORKING_DIRECTORY ${tox_path})
-- set_tests_properties(setup-venv-for-${name} PROPERTIES
-- FIXTURES_SETUP venv-for-${name})
-- add_test(
-- NAME teardown-venv-for-${name}
-- COMMAND ${CMAKE_COMMAND} -E remove_directory ${venv_path})
-- set_tests_properties(teardown-venv-for-${name} PROPERTIES
-- FIXTURES_CLEANUP venv-for-${name})
- add_test(
- NAME ${test_name}
- COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
- --source-dir ${CMAKE_SOURCE_DIR}
- --build-dir ${CMAKE_BINARY_DIR}
- --tox-path ${tox_path}
-- --tox-envs ${tox_envs}
-- --venv-path ${venv_path})
-- set_tests_properties(${test_name} PROPERTIES
-- FIXTURES_REQUIRED venv-for-${name})
-+ --tox-envs ${tox_envs})
- set_property(
- TEST ${test_name}
- PROPERTY ENVIRONMENT
-diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
-index 9166553dc73..9a6c87595b9 100644
---- a/src/ceph-volume/CMakeLists.txt
-+++ b/src/ceph-volume/CMakeLists.txt
-@@ -8,22 +8,6 @@ if(FREEBSD)
- add_subdirectory(plugin/zfs)
- endif()
-
--# Required for running ceph-volume inventory in a vstart environment
--set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "ceph-volume venv is being created")
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
-- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
--
- add_custom_target(ceph-volume-venv-setup
- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
-
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2022-08-10 20:21 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2022-08-10 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 9826b9703d7cff5d16537212334dacb0c21072ad
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 20:20:39 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 20:21:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9826b970
sys-cluster/ceph: Remove unused files
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/files/ceph.logrotate | 18 -----
sys-cluster/ceph/files/rbdmap.initd | 122 ----------------------------------
2 files changed, 140 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
deleted file mode 100644
index df03f5e69a4b..000000000000
--- a/sys-cluster/ceph/files/ceph.logrotate
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/log/ceph/*.log
-{
- rotate 7
- daily
- compress
- sharedscripts
- prerotate
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
- ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null
- done
- endscript
- postrotate
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do
- ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null
- done
- endscript
- missingok
-}
diff --git a/sys-cluster/ceph/files/rbdmap.initd b/sys-cluster/ceph/files/rbdmap.initd
deleted file mode 100644
index 9313cf658863..000000000000
--- a/sys-cluster/ceph/files/rbdmap.initd
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/openrc-run
-
-DESC="RBD Mapping:"
-RBDMAPFILE="/etc/ceph/rbdmap"
-
-extra_started_commands="reload"
-
-depend() {
- need localmount net
- before netmount
-}
-
-start() {
-
- if [ ! -f "${RBDMAPFILE}" ]; then
- ewarn "$DESC : No ${RBDMAPFILE} found."
- exit 0
- fi
-
- RET=0
- # Read /etc/ceph/rbdmap to create non-existant mapping
- while read DEV PARAMS; do
- case "$DEV" in
- ""|\#*)
- continue
- ;;
- */*)
- ;;
- *)
- DEV=rbd/$DEV
- ;;
- esac
- ebegin "${DESC} '${DEV}'"
- newrbd=""
- MAP_RV=""
- RET_OP=0
- OIFS=$IFS
- IFS=','
- for PARAM in ${PARAMS[@]}; do
- CMDPARAMS="${CMDPARAMS} --$(echo ${PARAM} | tr '=' ' ')"
- done
- IFS=$OIFS
- if [ ! -b /dev/rbd/${DEV} ]; then
- MAP_RV=$(rbd map ${DEV} ${CMDPARAMS} 2>&1)
- if [ $? -eq 0 ]; then
- newrbd="yes"
- else
- RET=$((${RET}+$?))
- RET_OP=1
- fi
- fi
- eend ${RET_OP} "${MAP_RV}"
-
- if [ "$newrbd" ]; then
- ## Mount new rbd
- MNT_RV=""
- mount --fake /dev/rbd/${DEV} >>/dev/null 2>&1 \
- && MNT_RV=$(mount -vn /dev/rbd/${DEV} 2>&1)
- [ -n "${MNT_RV}" ] && einfo "mount: ${MNT_RV}"
-
- ## post-mapping
- if [ -x "/etc/ceph/rbd.d/${DEV}" ]; then
- einfo "RBD Running post-map hook '/etc/ceph/rbd.d/${DEV}'"
- /etc/ceph/rbd.d/${DEV} map "/dev/rbd/${DEV}"
- fi
- fi
- done < ${RBDMAPFILE}
- eend ${RET}
-}
-
-stop() {
-
- RET=0
- ## Unmount and unmap all rbd devices
- if ls /dev/rbd[0-9]* >/dev/null 2>&1; then
- for DEV in /dev/rbd[0-9]*; do
- ## pre-unmapping
- for L in $(find /dev/rbd -type l); do
- LL="${L##/dev/rbd/}"
- if [ "$(readlink -f $L)" = "${DEV}" ] \
- && [ -x "/etc/ceph/rbd.d/${LL}" ]; then
- einfo "RBD pre-unmap: '${DEV}' hook '/etc/ceph/rbd.d/${LL}'"
- /etc/ceph/rbd.d/${LL} unmap "$L"
- break
- fi
- done
-
- ebegin "Unmapping RBD device: '${DEV}'"
- UMNT_RV=""
- UMAP_RV=""
- RET_OP=0
- MNT=$(findmnt --mtab --source ${DEV} --noheadings | awk '{print $1'})
- if [ -n "${MNT}" ]; then
- einfo "un-mounting '${MNT}'"
- UMNT_RV=$(umount "${MNT}" 2>&1)
- fi
- if mountpoint -q "${MNT}"; then
- ## Un-mounting failed.
- RET_OP=1
- RET=$((${RET}+1))
- else
- ## Un-mapping.
- UMAP_RV=$(rbd unmap $DEV 2>&1)
- if [ $? -ne 0 ]; then
- RET=$((${RET}+$?))
- RET_OP=1
- fi
- fi
- eend ${RET_OP} "${UMAP_RV}"
- [ -n "${UMNT_RV}" ] && einfo "${UMNT_RV}"
- done
- fi
- eend ${RET}
-}
-
-reload() {
- start
-}
-
-status() {
- rbd showmapped
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2022-08-12 22:13 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2022-08-12 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 372ba908ebe1304afb21b4197ab621f57c9d59d7
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 22:12:37 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 22:13:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372ba908
sys-cluster/ceph: Fix opentelemetry dep in cmake (bug #848834)
Don't depend on a specific version of opentelemetry-cpp in the CMakeLists.txt
file.
Closes: https://bugs.gentoo.org/848834
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch b/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
index 6e0788a093e5..1b4e614bb517 100644
--- a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
+++ b/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
@@ -9,7 +9,7 @@ index 30cf3605468..902e2123d04 100644
- include(BuildOpentelemetry)
- build_opentelemetry()
- set(jaeger_base opentelemetry::libopentelemetry thrift::libthrift)
-+ find_package(opentelemetry-cpp 1.3.0 REQUIRED)
++ find_package(opentelemetry-cpp REQUIRED)
+ set(jaeger_base
+ opentelemetry-cpp::common
+ opentelemetry-cpp::trace
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2022-08-24 1:53 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2022-08-24 1:53 UTC (permalink / raw
To: gentoo-commits
commit: 35ff86bd118846126973f9410a94d35c0e1aae2a
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 01:53:07 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 01:53:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ff86bd
sys-cluster/ceph: Remove unused script
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ceph/files/make-node-frontend-tarball.bash | 140 ---------------------
1 file changed, 140 deletions(-)
diff --git a/sys-cluster/ceph/files/make-node-frontend-tarball.bash b/sys-cluster/ceph/files/make-node-frontend-tarball.bash
deleted file mode 100644
index 0a8015ffa985..000000000000
--- a/sys-cluster/ceph/files/make-node-frontend-tarball.bash
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-frontend_path="src/pybind/mgr/dashboard/frontend"
-node_dir="node_modules"
-output_name_format="ceph-%s-frontend-node-modules.tar.xz"
-cache_dir_format="ceph-%s-npm-cache"
-
-# regexes for modules to remove
-remove_modules=(
- "^karma.*"
- "^jasmine.*"
- ".+/jasmine.*"
- "^tslint.*"
- "^codelyzer"
- "^protractor"
- "^ts-node"
-)
-
-# location to find dependencies to prune
-node_dep_location="devDependencies"
-
-# node package files
-node_package_file="package.json"
-node_package_lock="package-lock.json"
-
-# system commands needed
-dependencies=(
- wget
- git
- gzip
- jq
- tar
- xz
-)
-
-check_deps() {
- local dep
-
- for dep in "${dependencies[@]}"; do
- if ! command -v "${dep}" >/dev/null; then
- printf '%s: ERROR could not find required command "%s"\n' "${appname}" "${dep}" >&2
- exit 1
- fi
- done
-
- # make sure that jq was compiled with support for regexes
- if ! jq -c 'map( select(. | test("TEST"; "i")))' <<< '{"TEST": "TEST"}' >/dev/null; then
- printf '%s: ERROR: jq does not support regular expressions, make sure the "oniguruma" USE flag is enabled\n' \
- "${appname}"
- exit 1
- fi
- :
-}
-
-get_npm_packages() {
- local tempfile jq_regex full_cache_dir
-
- full_cache_dir="${PWD}/${cache_dir}"
-
- pushd "${source_path}/${frontend_path}" > /dev/null
- if [[ ! -r "${node_package_file}" ]]; then
- printf '%s: ERROR: could not find "%s" in "%s"\n' "${appname}" \
- "${node_package_file}" "${frontend_path}"
- exit 1
- fi
-
- tempfile="$(TMPDIR="." mktemp packages-XXXXX.json)"
-
- jq_regex="$(printf "%s|" "${remove_modules[@]}")"
-
- # filter out test only deps that pull in precompiled binaries
- # shellcheck disable=SC2031
- jq --monochrome-output --raw-output --exit-status \
- '."'"${node_dep_location}"'"|=with_entries(select(.key|test("('"${jq_regex%|}"')")|not))' \
- "${node_package_file}" > "${tempfile}"
-
- # make sure output is still valid JSON
- jq . --exit-status "${tempfile}" > /dev/null
-
- mv "${tempfile}" "${node_package_file}"
-
- rm -rf "${full_cache_dir:?}" "${node_dir:?}" "${node_package_lock:?}"
-
- npm install --ignore-scripts --cache="${full_cache_dir}"
-
- popd >/dev/null
-}
-
-main() {
- local appname source_path version cache_dir
-
- set -e
- set -o pipefail
- shopt -s nullglob
-
- appname=$(basename "${0}")
- source_path="${1}"
- version="${2}"
-
- if [[ -z ${source_path} || -z ${version} ]]; then
- printf 'Syntax: %s <source directory> <version>\n' "${appname}" >&2
- return 1
-
- elif [[ ! -d ${source_path} ]]; then
- printf '%s: ERROR: Not a directory: %s\n' "${appname}" "${source_path}"
- return 1
- fi
-
- check_deps
-
- # shellcheck disable=SC2059
- cache_dir="$(printf -- "${cache_dir_format}\\n" "${version}")"
-
- get_npm_packages
- pack_tarball
-}
-
-pack_tarball() {
- local output
-
- # shellcheck disable=SC2059
- output="$(printf -- "${output_name_format}\\n" "${version}")"
-
- tar caf "${output}" \
- --numeric-owner \
- --anchored \
- --owner="root:0" \
- --group="root:0" \
- --exclude-vcs \
- --transform="s:^${source_path}/:ceph-${version}/:" \
- "${cache_dir}" \
- "${source_path}/${frontend_path}/${node_package_file}" \
- "${source_path}/${frontend_path}/${node_package_lock}"
-
- printf '%s: Output written to "%s"\n' "${appname}" "${output}"
-}
-
-main "${@}"
-
-# vim:ft=sh:noet:ts=4:sts=4:sw=4:
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2022-09-29 18:34 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2022-09-29 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 384b7f3eb1f4887f20999750642cf9c9c465c390
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 28 16:52:37 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 18:33:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384b7f3e
sys-cluster/ceph: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.37 / pkgdev 0.2.2 / pkgcheck 0.10.15
Closes: https://github.com/gentoo/gentoo/pull/27515
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/files/ceph-16.2.10-gcc12.patch | 45 -------------------------
1 file changed, 45 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-16.2.10-gcc12.patch b/sys-cluster/ceph/files/ceph-16.2.10-gcc12.patch
deleted file mode 100644
index 79bc5d41f410..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.10-gcc12.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/include/buffer.h b/src/include/buffer.h
-index 7c8f90e9fb5d3..71cb01935000b 100644
---- a/src/include/buffer.h
-+++ b/src/include/buffer.h
-@@ -41,6 +41,7 @@
- #include <iosfwd>
- #include <iomanip>
- #include <list>
-+#include <memory>
- #include <vector>
- #include <string>
- #if __cplusplus >= 201703L
-
-diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h
-index 257daa9c1fe6e..90e64f98a2587 100644
---- a/src/rgw/rgw_string.h
-+++ b/src/rgw/rgw_string.h
-@@ -8,6 +8,8 @@
- #include <stdlib.h>
- #include <limits.h>
- #include <string_view>
-+#include <string>
-+#include <stdexcept>
-
- #include <boost/container/small_vector.hpp>
-
-
-diff --git a/src/test/encoding.cc b/src/test/encoding.cc
-index 6d252fae18b71..f18901cbd27d9 100644
---- a/src/test/encoding.cc
-+++ b/src/test/encoding.cc
-@@ -334,11 +334,11 @@ void lame_decoder(int which) {
- }
-
- TEST(EncodingException, Macros) {
-- for (unsigned i = 0; i < sizeof(expected_what)/sizeof(expected_what[0]); i++) {
-+ for (unsigned i = 0; i < std::size(expected_what); i++) {
- try {
- lame_decoder(i);
- } catch (const exception& e) {
-- ASSERT_EQ(string(expected_what[i]), string(e.what()));
-+ ASSERT_NE(string(e.what()).find(expected_what[i]), string::npos);
- }
- }
- }
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2023-02-06 1:57 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2023-02-06 1:57 UTC (permalink / raw
To: gentoo-commits
commit: b194ae357b49d1477503743e2df90bcd3cad3b98
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 4 22:41:02 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 01:57:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b194ae35
sys-cluster/ceph: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29429
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ceph/files/ceph-17.2.0-gcc12-dout.patch | 42 ----------------------
sys-cluster/ceph/files/ceph-17.2.1-python310.patch | 12 -------
sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch | 31 ----------------
3 files changed, 85 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-gcc12-dout.patch b/sys-cluster/ceph/files/ceph-17.2.0-gcc12-dout.patch
deleted file mode 100644
index d119bf1bf11d..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.0-gcc12-dout.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 841806de212226921eeaeb3eea054bda8ccce616 Mon Sep 17 00:00:00 2001
-From: Radoslaw Zarzynski <rzarzyns@redhat.com>
-Date: Wed, 19 Jan 2022 15:24:11 +0000
-Subject: [PATCH 2/2] common: fix FTBFS due to dout & need_dynamic on GCC-12
-
-For details see:
-https://gist.github.com/rzarzynski/d6d2df6888923bef6a3e764f4856853f.
-
-Special thanks to Kaleb Keithley who reported the issue
-and tested the fix!
-
-Fixes: https://tracker.ceph.com/issues/53896
-Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
-
-Upstream-Status: Backport [963d756ded40f5adf2efef53893c917bec1845c1]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- src/common/dout.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/common/dout.h b/src/common/dout.h
-index c7c08182..42f49915 100644
---- a/src/common/dout.h
-+++ b/src/common/dout.h
-@@ -99,11 +99,12 @@ namespace ceph::dout {
- template<typename T>
- struct dynamic_marker_t {
- T value;
-- operator T() const { return value; }
-+ // constexpr ctor isn't needed as it's an aggregate type
-+ constexpr operator T() const { return value; }
- };
-
- template<typename T>
--dynamic_marker_t<T> need_dynamic(T&& t) {
-+constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
- return dynamic_marker_t<T>{ std::forward<T>(t) };
- }
-
---
-2.36.0
-
diff --git a/sys-cluster/ceph/files/ceph-17.2.1-python310.patch b/sys-cluster/ceph/files/ceph-17.2.1-python310.patch
deleted file mode 100644
index 959e98a8067a..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.1-python310.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 55147af4fc6ba..8f39e41ac0694 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -33,6 +33,7 @@ if(WITH_MGR)
- mgr_commands.cc
- $<TARGET_OBJECTS:mgr_cap_obj>)
- add_executable(ceph-mgr ${mgr_srcs})
-+ target_compile_definitions(ceph-mgr PRIVATE PY_SSIZE_T_CLEAN)
- if(WITH_LIBCEPHSQLITE)
- target_link_libraries(ceph-mgr cephsqlite SQLite3::SQLite3)
- endif()
diff --git a/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch b/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch
deleted file mode 100644
index 356da385fedb..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/include/buffer.h b/src/include/buffer.h
-index 7c8f90e9fb5d3..71cb01935000b 100644
---- a/src/include/buffer.h
-+++ b/src/include/buffer.h
-@@ -41,6 +41,7 @@
- #include <iosfwd>
- #include <iomanip>
- #include <list>
-+#include <memory>
- #include <vector>
- #include <string>
- #if __cplusplus >= 201703L
-
-diff --git a/src/test/encoding.cc b/src/test/encoding.cc
-index 6d252fae18b71..f18901cbd27d9 100644
---- a/src/test/encoding.cc
-+++ b/src/test/encoding.cc
-@@ -334,11 +334,11 @@ void lame_decoder(int which) {
- }
-
- TEST(EncodingException, Macros) {
-- for (unsigned i = 0; i < sizeof(expected_what)/sizeof(expected_what[0]); i++) {
-+ for (unsigned i = 0; i < std::size(expected_what); i++) {
- try {
- lame_decoder(i);
- } catch (const exception& e) {
-- ASSERT_EQ(string(expected_what[i]), string(e.what()));
-+ ASSERT_NE(string(e.what()).find(expected_what[i]), string::npos);
- }
- }
- }
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2023-05-02 21:01 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2023-05-02 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 714f2e4e2e13ff1522e56d1f54828587632fe9d4
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue May 2 18:55:09 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue May 2 21:01:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714f2e4e
sys-cluster/ceph: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30844
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../ceph/files/ceph-16.2.7-string-includes.patch | 23 ----------------------
sys-cluster/ceph/files/ceph-16.2.9-python310.patch | 12 -----------
2 files changed, 35 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-16.2.7-string-includes.patch b/sys-cluster/ceph/files/ceph-16.2.7-string-includes.patch
deleted file mode 100644
index f703a8fcf46a..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.7-string-includes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit ebf3a0398f18eab67d2ba25e6a10b41ff140f6a4
-Author: Duncan Bellamy <dunk@denkimushi.com>
-Date: Fri May 21 06:30:10 2021 +0100
-
- rgw/rgw_string.h: add missing includes for alpine and boost 1.75
- alpine needs: string, stdexcept
-
- Fixes: https://tracker.ceph.com/issues/50924
- Signed-off-by: Duncan Bellamy <dunk@denkimushi.com>
-
-diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h
-index 257daa9c1fe..90e64f98a25 100644
---- a/src/rgw/rgw_string.h
-+++ b/src/rgw/rgw_string.h
-@@ -8,6 +8,8 @@
- #include <stdlib.h>
- #include <limits.h>
- #include <string_view>
-+#include <string>
-+#include <stdexcept>
-
- #include <boost/container/small_vector.hpp>
-
diff --git a/sys-cluster/ceph/files/ceph-16.2.9-python310.patch b/sys-cluster/ceph/files/ceph-16.2.9-python310.patch
deleted file mode 100644
index 403cfe2f3d1d..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.9-python310.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 38aad299ccb..8e152e060ea 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -34,6 +34,7 @@ if(WITH_MGR)
- mgr_commands.cc
- $<TARGET_OBJECTS:mgr_cap_obj>)
- add_executable(ceph-mgr ${mgr_srcs})
-+ target_compile_definitions(ceph-mgr PRIVATE PY_SSIZE_T_CLEAN)
- target_link_libraries(ceph-mgr
- osdc client heap_profiler
- global-static ceph-common
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2023-06-09 17:50 Patrick McLean
0 siblings, 0 replies; 27+ messages in thread
From: Patrick McLean @ 2023-06-09 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 1871ed38b7c79bfafe8a1e5d5ed5b2bfd106c29c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jun 9 16:49:49 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 17:50:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1871ed38
sys-cluster/ceph: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31366
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch | 37 ----------------------
.../files/ceph-17.2.5-link-boost-context.patch | 10 ------
2 files changed, 47 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch b/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch
deleted file mode 100644
index c23badcc5e09..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/878531
-https://github.com/ceph/ceph/pull/48661
-
-From 74794f9d6f5c6671438085bdba730b504901a7c0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 28 Oct 2022 16:47:38 +0100
-Subject: [PATCH] common: fix build with GCC 13 (missing <cstdint> include)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Needed for uint8_t. Only worked by chance before (see
-https://www.gnu.org/software/gcc/gcc-13/porting_to.html).
-
-```
-FAILED: src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o
-/usr/bin/x86_64-pc-linux-gnu-g++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -D__CEPH__ -D__STDC_FORMAT_MACROS -D__linux__ -I/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5_build/src/include -I/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5_build/include -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/xxHash -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/rapidjson/include -O2 -march=native -pipe -fPIC -U_FORTIFY_SOURCE -Wall -fno-strict-aliasing -fsigned-char -Wtype-limits -Wignored-qualifiers -Wpointer-arith -Werror=format-security -Winit-self -Wno-unknown-pragmas -Wnon-virtual-dtor -Wno-ignored-qualifiers -ftemplate-depth-1024 -Wpessimizing-move -Wredundant-move -Wstrict-null-sentinel -Woverloaded-virtual -fno-new-ttp-matching -fstack-protec
tor-strong -fdiagnostics-color=auto -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -std=c++17 -MD -MT src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o -MF src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o.d -o src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o -c /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.cc
-In file included from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/log/SubsystemMap.h:12,
- from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/common/config.h:23,
- from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/mdstypes.h:13,
- from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.h:21,
- from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.cc:1:
-/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/common/subsys_types.h:56:23: error: ‘uint8_t’ in namespace ‘std’ does not name a type; did you mean ‘wint_t’?
-```
-
-Bug: https://bugs.gentoo.org/878531
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/common/subsys_types.h
-+++ b/src/common/subsys_types.h
-@@ -17,6 +17,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <cstdint>
-
- enum ceph_subsys_id_t {
- ceph_subsys_, // default
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch b/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
deleted file mode 100644
index 9ebc70ecce9e..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/src/neorados/CMakeLists.txt b/src/neorados/CMakeLists.txt
-index 3c7aee7c6fe..bda666ea95b 100644
---- a/src/neorados/CMakeLists.txt
-+++ b/src/neorados/CMakeLists.txt
-@@ -41,4 +41,4 @@ target_link_libraries(libneorados PRIVATE
- # install(TARGETS libneorados DESTINATION ${CMAKE_INSTALL_LIBDIR})
- add_library(neorados_cls_fifo STATIC cls/fifo.cc)
- target_link_libraries(neorados_cls_fifo PRIVATE
-- libneorados ceph-common fmt::fmt)
-+ libneorados ceph-common fmt::fmt Boost::context)
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
@ 2024-10-15 21:46 Conrad Kostecki
0 siblings, 0 replies; 27+ messages in thread
From: Conrad Kostecki @ 2024-10-15 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 90e0f5c85a735f39253c1ad8b70529a09066d9b5
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Oct 14 15:35:15 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 21:45:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e0f5c8
sys-cluster/ceph: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../ceph/files/ceph-14.2.0-cython-0.29.patch | 17 ---
.../ceph/files/ceph-15.2.3-spdk-compile.patch | 9 --
sys-cluster/ceph/files/ceph-16.2.10-flags.patch | 14 ---
sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch | 84 ---------------
.../ceph/files/ceph-16.2.2-system-zstd.patch | 40 -------
.../ceph/files/ceph-16.2.8-no-virtualenvs.patch | 82 ---------------
.../ceph-19.1.0-boost-build-none-options.patch | 13 ---
sys-cluster/ceph/files/ceph.initd-r13 | 115 ---------------------
8 files changed, 374 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
deleted file mode 100644
index be133c121d0c..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ceph-13.2.1/cmake/modules/Distutils.cmake.old 2018-07-26 17:39:56.000000000 -0000
-+++ ceph-13.2.1/cmake/modules/Distutils.cmake 2018-12-24 05:43:51.566174070 -0000
-@@ -58,8 +62,13 @@
- function(distutils_install_cython_module name)
- get_property(compiler_launcher GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
- get_property(link_launcher GLOBAL PROPERTY RULE_LAUNCH_LINK)
-- set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER}")
-+ string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
-+ list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
-+ list(APPEND cflags -D'void0=dead_function\(void\)')
-+ list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0')
-+ string(REPLACE ";" " " cflags "${cflags}")
-+ set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER} ${cflags}")
- set(PY_LDSHARED "${link_launcher} ${CMAKE_C_COMPILER} -shared")
- install(CODE "
- set(ENV{CC} \"${PY_CC}\")
- set(ENV{LDSHARED} \"${PY_LDSHARED}\")
diff --git a/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch b/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
deleted file mode 100644
index 3ea6eadbb86f..000000000000
--- a/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- ceph-15.2.3.orig/cmake/modules/BuildSPDK.cmake 2020-05-29 09:24:50.000000000 -0700
-+++ ceph-15.2.3/cmake/modules/BuildSPDK.cmake 2020-06-01 10:36:14.629306433 -0700
-@@ -1,5 +1,5 @@
- macro(build_spdk)
-- set(DPDK_DIR ${CMAKE_BINARY_DIR}/src/dpdk)
-+ set(DPDK_DIR ${CMAKE_SOURCE_DIR}/src/dpdk)
- if(NOT TARGET dpdk-ext)
- include(BuildDPDK)
- build_dpdk(${DPDK_DIR})
diff --git a/sys-cluster/ceph/files/ceph-16.2.10-flags.patch b/sys-cluster/ceph/files/ceph-16.2.10-flags.patch
deleted file mode 100644
index 79002b3a5fce..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.10-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
-index 01a6fc500c8..9eb4658482f 100644
---- a/cmake/modules/Distutils.cmake
-+++ b/cmake/modules/Distutils.cmake
-@@ -90,7 +90,8 @@ function(distutils_add_cython_module target name src)
- CXX="${PY_CXX}"
- LDSHARED="${PY_LDSHARED}"
- OPT=\"-DNDEBUG -g -fwrapv -w\"
-- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-+ CFLAGS=${CMAKE_C_FLAGS}
-+ LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\ ${CMAKE_LINKER_FLAGS}\ ${CMAKE_SHARED_LINKER_FLAGS}
- CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
- CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
- ${Python3_EXECUTABLE} ${setup_py}
diff --git a/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch b/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch
deleted file mode 100644
index 7f84a19706dc..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/src/common/Cycles.h b/src/common/Cycles.h
-index 16e0aa67fc1..791be43469c 100644
---- a/src/common/Cycles.h
-+++ b/src/common/Cycles.h
-@@ -29,8 +29,9 @@
- */
-
-
--#ifndef CEPH_CYCLES_H
--#define CEPH_CYCLES_H
-+#pragma once
-+
-+#include <cstdint>
-
- /**
- * This class provides static methods that read the fine-grain CPU
-@@ -112,4 +113,3 @@ private:
- }
- };
-
--#endif // CEPH_CYCLES_H
-diff --git a/src/common/subsys_types.h b/src/common/subsys_types.h
-index 52171809b23..1a2ab796b6d 100644
---- a/src/common/subsys_types.h
-+++ b/src/common/subsys_types.h
-@@ -53,7 +53,7 @@ ceph_subsys_get_as_array() {
- #undef DEFAULT_SUBSYS
- }
-
--constexpr static std::uint8_t
-+constexpr static uint8_t
- ceph_subsys_get_max_default_level(const std::size_t subidx) {
- const auto item = ceph_subsys_get_as_array()[subidx];
- return std::max(item.log_level, item.gather_level);
-diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
-index c0a8173596e..8d982879aa9 100644
---- a/src/librbd/api/PoolMetadata.h
-+++ b/src/librbd/api/PoolMetadata.h
-@@ -9,6 +9,7 @@
-
- #include <map>
- #include <string>
-+#include <cstdint>
-
- namespace librbd {
-
-diff --git a/src/msg/async/crypto_onwire.h b/src/msg/async/crypto_onwire.h
-index 55f7550868f..2213c21d08d 100644
---- a/src/msg/async/crypto_onwire.h
-+++ b/src/msg/async/crypto_onwire.h
-@@ -95,7 +95,7 @@ public:
- // Transmitter can append extra bytes of ciphertext at the -final step.
- // This method return how much was added, and thus let client translate
- // plaintext size into ciphertext size to grab from wire.
-- virtual std::uint32_t get_extra_size_at_final() = 0;
-+ virtual uint32_t get_extra_size_at_final() = 0;
-
- // Instance of RxHandler must be reset before doing any decrypt-update
- // step. This applies also to situation when decrypt-final was already
-diff --git a/src/test/librados/op_speed.cc b/src/test/librados/op_speed.cc
-index 90c7bdac571..9452da6dcc9 100644
---- a/src/test/librados/op_speed.cc
-+++ b/src/test/librados/op_speed.cc
-@@ -9,7 +9,7 @@ int main() {
- for (int i = 0; i < to_create; ++i) {
- librados::ObjectReadOperation op;
- bufferlist bl;
-- std::uint64_t sz;
-+ uint64_t sz;
- struct timespec tm;
- std::map<std::string, ceph::buffer::list> xattrs;
- std::map<std::string, ceph::buffer::list> omap;
-diff --git a/src/test/mon/test_log_rss_usage.cc b/src/test/mon/test_log_rss_usage.cc
-index f6e85f414c8..9769cabd884 100644
---- a/src/test/mon/test_log_rss_usage.cc
-+++ b/src/test/mon/test_log_rss_usage.cc
-@@ -5,6 +5,7 @@
- #include <string>
- #include <iostream>
- #include <fstream>
-+#include <cstdint>
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
diff --git a/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch b/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch
deleted file mode 100644
index c50cca4e2ca0..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
-index b53b0d9444..5bf5796da2 100644
---- a/src/compressor/zstd/CMakeLists.txt
-+++ b/src/compressor/zstd/CMakeLists.txt
-@@ -1,34 +1,11 @@
- # zstd
-
--# libzstd - build it statically
--set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3")
--
--include(ExternalProject)
--ExternalProject_Add(zstd_ext
-- SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/zstd/build/cmake
-- CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-- -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS}
-- -DCMAKE_AR=${CMAKE_AR}
-- -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_SHARED}
-- -G${CMAKE_GENERATOR}
-- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd
-- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target libzstd_static
-- BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a"
-- INSTALL_COMMAND "true")
--
--add_library(zstd STATIC IMPORTED)
--set_target_properties(zstd PROPERTIES
-- INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/zstd/lib"
-- IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a")
--add_dependencies(zstd zstd_ext)
--
- set(zstd_sources
- CompressionPluginZstd.cc
- )
-
- add_library(ceph_zstd SHARED ${zstd_sources})
--target_link_libraries(ceph_zstd PRIVATE zstd $<$<PLATFORM_ID:Windows>:ceph-common>)
-+target_link_libraries(ceph_zstd zstd)
- set_target_properties(ceph_zstd PROPERTIES
- VERSION 2.0.0
- SOVERSION 2
diff --git a/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch
deleted file mode 100644
index 79aee882c2a4..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
-index cd661be16c9..7183c2f2138 100644
---- a/cmake/modules/AddCephTest.cmake
-+++ b/cmake/modules/AddCephTest.cmake
-@@ -55,7 +55,6 @@ endfunction()
-
- function(add_tox_test name)
- set(test_name run-tox-${name})
-- set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv)
- cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN})
- if(DEFINED TOXTEST_TOX_PATH)
- set(tox_path ${TOXTEST_TOX_PATH})
-@@ -68,14 +67,6 @@ function(add_tox_test name)
- list(APPEND tox_envs py3)
- endif()
- string(REPLACE ";" "," tox_envs "${tox_envs}")
-- add_custom_command(
-- OUTPUT ${venv_path}/bin/activate
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path}
-- WORKING_DIRECTORY ${tox_path}
-- COMMENT "preparing venv for ${name}")
-- add_custom_target(${name}-venv
-- DEPENDS ${venv_path}/bin/activate)
-- add_dependencies(tests ${name}-venv)
- add_test(
- NAME ${test_name}
- COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
-diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
-index 9166553dc73..9a6c87595b9 100644
---- a/src/ceph-volume/CMakeLists.txt
-+++ b/src/ceph-volume/CMakeLists.txt
-@@ -8,22 +8,6 @@ if(FREEBSD)
- add_subdirectory(plugin/zfs)
- endif()
-
--# Required for running ceph-volume inventory in a vstart environment
--set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "ceph-volume venv is being created")
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
-- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
--
- add_custom_target(ceph-volume-venv-setup
- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
-
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 0c8d46d65ee..67a618f95aa 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -5,9 +5,6 @@ function(add_npm_command)
- set(multi_kw COMMAND DEPENDS)
- cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
- string(REPLACE ";" " " command "${NC_COMMAND}")
-- if(NC_NODEENV)
-- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-- endif()
- string(REPLACE " " ";" command "${command}")
- add_custom_command(
- OUTPUT "${NC_OUTPUT}"
-@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM)
- set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}")
- endif()
- add_custom_command(
-- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=12.18.2
-- COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
-+ OUTPUT "/bin/npm"
-+ COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed"
- )
diff --git a/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch b/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch
deleted file mode 100644
index bef4f6199eb0..000000000000
--- a/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/boost/tools/build/src/tools/features/optimization-feature.jam b/src/boost/tools/build/src/tools/features/optimization-feature.jam
-index 761f76f1..fb2a5dec 100644
---- a/src/boost/tools/build/src/tools/features/optimization-feature.jam
-+++ b/src/boost/tools/build/src/tools/features/optimization-feature.jam
-@@ -8,7 +8,7 @@
- import feature ;
-
- feature.feature optimization
-- : off speed space
-+ : off none speed space
- : propagated ;
-
- feature.feature inlining
diff --git a/sys-cluster/ceph/files/ceph.initd-r13 b/sys-cluster/ceph/files/ceph.initd-r13
deleted file mode 100644
index 2d158ad80be3..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r13
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/sbin/openrc-run
-
-# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
-_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
-if [ -r "${_CONFD_FILE}" ]; then
- . "${_CONFD_FILE}" || exit 1
-fi
-
-: "${ceph_conf:=/etc/ceph/ceph.conf}"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: "${rundir:=/run/ceph}"
-: "${user:=ceph}"
-: "${group:=ceph}"
-: "${rc_ulimit:=-n 1048576 -u 1048576}"
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-extra_commands="${extra_commands} reload"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: "${supervisor:=supervise-daemon}"
-: "${stdout:=/var/log/ceph/console/ceph}"
-: "${stderr:=/var/log/ceph/console/ceph}"
-: "${respawn_delay:=10}"
-: "${respawn_max:=5}"
-: "${respawn_period:=1800}"
-
-: "${osd_respawn_delay:=15}"
-: "${osd_respawn_max:=10}"
-
-: "${radosgw_respawn_max:=5}"
-: "${radosgw_respawn_period:=30}"
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- local log_dir
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- if [ -n "${bluestore_osd_fsid}" ]; then
- einfo "Mounting Bluestore"
- ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
- fi
-
- if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
- command_args="${command_args} --name client.${daemon_id}"
- fi
-
- local arg_name arg_val repl_arg_name
- for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- local log_file log_postfix
- log_postfix=".${daemon_id}-${arg_name}.log"
- log_file="${arg_val}"
-
- if [ "${log_file}" != /dev/null ]; then
- log_file="${log_file}${log_postfix}"
-
- log_dir="$(dirname "${log_file}")"
- checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
- fi
-
- repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
- supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
^ permalink raw reply related [flat|nested] 27+ messages in thread
end of thread, other threads:[~2024-10-15 21:46 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-05 15:39 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2024-10-15 21:46 Conrad Kostecki
2023-06-09 17:50 Patrick McLean
2023-05-02 21:01 Patrick McLean
2023-02-06 1:57 Patrick McLean
2022-09-29 18:34 Patrick McLean
2022-08-24 1:53 Patrick McLean
2022-08-12 22:13 Patrick McLean
2022-08-10 20:21 Patrick McLean
2022-07-18 17:33 Patrick McLean
2022-05-05 22:51 Patrick McLean
2022-03-12 18:45 David Seifert
2021-10-26 17:49 Patrick McLean
2021-05-27 20:56 Patrick McLean
2021-03-26 18:32 Conrad Kostecki
2021-03-01 22:11 Conrad Kostecki
2021-02-04 19:59 Patrick McLean
2020-06-27 20:51 Aaron Bauman
2020-04-23 17:54 Patrick McLean
2019-04-20 1:29 Aaron Bauman
2019-03-25 23:59 Patrick McLean
2018-08-07 23:37 Patrick McLean
2017-10-19 22:56 Patrick McLean
2017-07-31 16:30 Patrick McLean
2017-02-10 22:34 David Seifert
2017-02-10 1:23 Patrick McLean
2015-12-23 3:15 Yixun Lan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox