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(
