commit: 362a4e4689a0c9c2b99b9acefd11d1a15a5d0c95
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Mar 12 19:04:47 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 19:05:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362a4e46
sys-cluster/ceph-14.2.17: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/Manifest | 2 +-
.../{ceph-15.2.8-r1.ebuild => ceph-14.2.17.ebuild} | 58 ++++++++--------------
sys-cluster/ceph/metadata.xml | 1 -
3 files changed, 22 insertions(+), 39 deletions(-)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 1ee2caf8190..75fbf254db9 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,3 +1,3 @@
DIST ceph-14.2.16.tar.gz 130220625 BLAKE2B
30fcf971dd3ebaad8decf0d8d3ade1b554c0f97844db037ca618fd3f133964c08248067dc82c525cbc7deb04949a3a3d07850a5f56e75bcb8e359957d31df85f
SHA512
94cab2c9711f5ee2c826ee27b474676c7bb8507c0761ed8d0a520a7e5182c4b353402061ffafbe9b95ac45603f023015752bffbbe0936f4835dfafc9476d3275
-DIST ceph-15.2.8.tar.gz 149565241 BLAKE2B
5b484734c0149aae95a5df2d4481c44e30bf23cdd25aa082084a7a69e5d3398711d45e7d634f98dc99d16a77d85456c13fe3fe0d241087a990e1524664597892
SHA512
66c7322575165b4747955ac9de34f9f9e2d4361c8cd8498819383883045601b92f786c4336c79369d6f019db1c4524c492faa40cdceed7fc1b2b373ca6ab5065
+DIST ceph-14.2.17.tar.gz 129270233 BLAKE2B
1e20185f24b7bc806a37ee59fee24138556837722e27a7fb36da268e5c330bb4dac3601dac4373f404c528e55fa79420f965807d215a54f5db9205ebb877166f
SHA512
56ae460474afb8f208900c9ec6f55b120dd7229cb3297cb6f4f522cde8e693ede16d6064410074ea3c2a56df67c13fbbd102bce2d489e9b310544e374315b9eb
DIST ceph-15.2.9.tar.gz 149518360 BLAKE2B
3d1d2cf7e356587d77c1ca3e6b05078a3de656607007d38ff0369f5a76fb9e12a3f06929bcbf19ed5d3de7c8e402dc0972c0b3c7245f64e6f5d94a4a78bb1d00
SHA512
1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff
diff --git a/sys-cluster/ceph/ceph-15.2.8-r1.ebuild
b/sys-cluster/ceph/ceph-14.2.17.ebuild
similarity index 87%
rename from sys-cluster/ceph/ceph-15.2.8-r1.ebuild
rename to sys-cluster/ceph/ceph-14.2.17.ebuild
index 246eace5c62..9b819976edd 100644
--- a/sys-cluster/ceph/ceph-15.2.8-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.17.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz";
- KEYWORDS="~amd64 ~arm64 ~ppc64"
+ KEYWORDS="~amd64 ~ppc64"
fi
DESCRIPTION="Ceph distributed filesystem"
@@ -29,8 +29,8 @@ SLOT="0"
CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
jemalloc
- kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq
+radosgw
- rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs"
+ kafka kerberos ldap lttng +mgr numa rabbitmq +radosgw +ssl spdk
system-boost
+ systemd +tcmalloc test xfs zfs"
IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
DEPEND="
@@ -43,15 +43,13 @@ DEPEND="
app-arch/zstd:=
app-shells/bash:0
app-misc/jq:=
- dev-cpp/gflags:=
dev-libs/crypto++:=
dev-libs/leveldb:=[snappy,tcmalloc(-)?]
dev-libs/libaio:=
- dev-libs/libfmt:=
dev-libs/libnl:3=
dev-libs/libxml2:=
<dev-libs/rocksdb-6.15:=
- dev-libs/xmlsec:=[!openssl?,!libressl?]
+ dev-libs/xmlsec:=[openssl]
dev-cpp/yaml-cpp:=
dev-libs/nss:=
dev-libs/protobuf:=
@@ -81,21 +79,11 @@ DEPEND="
rabbitmq? ( net-libs/rabbitmq-c:= )
radosgw? (
dev-libs/expat:=
- openssl? (
- dev-libs/openssl:=
- net-misc/curl:=[curl_ssl_openssl]
- )
- libressl? (
- dev-libs/libressl:=
- net-misc/curl:=[curl_ssl_libressl]
- )
+ dev-libs/openssl:=
+ net-misc/curl:=[curl_ssl_openssl]
)
- ssl? (
- openssl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
- system-boost? (
>=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
- uring? ( sys-libs/liburing:= )
+ ssl? ( dev-libs/openssl:= )
+ system-boost? ( dev-libs/boost[threads,context,python,${PYTHON_USEDEP}]
)
xfs? ( sys-fs/xfsprogs:= )
zfs? ( sys-fs/zfs:= )
${PYTHON_DEPS}
@@ -131,7 +119,6 @@ RDEPEND="${DEPEND}
app-admin/sudo
net-misc/socat
sys-apps/gptfdisk
- sys-apps/nvme-cli
>=sys-apps/smartmontools-7.0
sys-block/parted
sys-fs/cryptsetup
@@ -140,7 +127,6 @@ RDEPEND="${DEPEND}
virtual/awk
dev-python/bcrypt[${PYTHON_USEDEP}]
dev-python/cherrypy[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/flask[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pecan[${PYTHON_USEDEP}]
@@ -149,10 +135,9 @@ RDEPEND="${DEPEND}
dev-python/requests[${PYTHON_USEDEP}]
dev-python/werkzeug[${PYTHON_USEDEP}]
mgr? (
- dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/more-itertools[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyjwt[${PYTHON_USEDEP}]
+ <dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/routes[${PYTHON_USEDEP}]
diskprediction? (
@@ -167,7 +152,6 @@ RDEPEND="${DEPEND}
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
?? ( jemalloc tcmalloc )
- ^^ ( openssl libressl )
diskprediction? ( mgr !python_targets_python3_8 )
kafka? ( radosgw )
mgr? ( cephfs )
@@ -192,17 +176,18 @@ PATCHES=(
"${FILESDIR}/ceph-14.2.0-cflags.patch"
"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
"${FILESDIR}/ceph-13.2.0-cflags.patch"
- "${FILESDIR}/ceph-15.2.0-no-virtualenvs.patch"
+ "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
+ "${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
- "${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
- "${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
- "${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
- "${FILESDIR}/ceph-15.2.4-system-uring.patch"
- "${FILESDIR}/ceph-15.2.5-missing-includes.patch"
- "${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
+ "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
+ "${FILESDIR}/ceph-14.2.4-python-executable.patch"
+ "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
+ "${FILESDIR}/ceph-14.2.10-build-without-mgr.patch"
+ "${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch"
+
"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
)
check-reqs_export_vars() {
@@ -234,8 +219,10 @@ src_prepare() {
-e 's|[Bb]oost_boost|boost_system|g' -i || die
fi
- sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
- src/bash_completion/CMakeLists.txt || die
+ sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+ -i src/bash_completion/CMakeLists.txt || die
+
+ sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
if ! use diskprediction; then
rm -rf src/pybind/mgr/diskprediction_local || die
@@ -249,7 +236,6 @@ ceph_src_configure() {
local flag
local mycmakeargs=(
-DWITH_BABELTRACE=$(usex babeltrace)
- -DWITH_BLUESTORE_PMEM=$(usex pmdk)
-DWITH_CEPHFS=$(usex cephfs)
-DWITH_CEPHFS_SHELL=$(usex cephfs)
-DWITH_DPDK=$(usex dpdk)
@@ -266,11 +252,9 @@ ceph_src_configure() {
-DWITH_RADOSGW=$(usex radosgw)
-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
- -DWITH_RBD_RWL=$(usex rbd-rwl)
-DWITH_SSL=$(usex ssl)
-DWITH_SYSTEMD=$(usex systemd)
-DWITH_TESTS=$(usex test)
- -DWITH_LIBURING=$(usex uring)
-DWITH_XFS=$(usex xfs)
-DWITH_ZFS=$(usex zfs)
-DENABLE_SHARED="ON"
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 141b26fdddb..cd3df6b4e4c 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -28,7 +28,6 @@
<flag name="lttng">Add support for LTTng</flag>
<flag name="mgr">Build the ceph-mgr daemon</flag>
<flag name="numa">Use <pkg>sys-process/numactl</pkg> for numa support in
rocksdb</flag>
- <flag name="openssl">Use <pkg>dev-libs/openssl</pkg></flag>
<flag name="pmdk">Enable PMDK libraries</flag>
<flag name="rabbitmq">Use rabbitmq-c to build rgw amqp push endpoint</flag>
<flag name="radosgw">Add radosgw support</flag>
