From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1209398-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3B092138359
for <garchives@archives.gentoo.org>; Fri, 25 Sep 2020 00:53:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D1239E0815;
Fri, 25 Sep 2020 00:53:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5F04AE0815
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Sep 2020 00:53:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 973B833F9D2
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Sep 2020 00:53:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C537353
for <gentoo-commits@lists.gentoo.org>; Fri, 25 Sep 2020 00:53:38 +0000 (UTC)
From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" <chutzpah@gentoo.org>
Message-ID: <1600995210.fe81ebff670ff16591084df5d04184b6912f40bf.chutzpah@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/, sys-cluster/ceph/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-cluster/ceph/ceph-14.2.11-r1.ebuild sys-cluster/ceph/ceph-15.2.5-r1.ebuild sys-cluster/ceph/ceph-15.2.5.ebuild sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch
X-VCS-Directories: sys-cluster/ceph/files/ sys-cluster/ceph/
X-VCS-Committer: chutzpah
X-VCS-Committer-Name: Patrick McLean
X-VCS-Revision: fe81ebff670ff16591084df5d04184b6912f40bf
X-VCS-Branch: master
Date: Fri, 25 Sep 2020 00:53:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6dafc809-a4cc-44ac-99e5-b1ddaacfdfec
X-Archives-Hash: 0e4831c8cdbfbc8c849f07ed28e4cb3a
commit: fe81ebff670ff16591084df5d04184b6912f40bf
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Sep 25 00:53:15 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 00:53:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe81ebff
sys-cluster/ceph: Revbumps, fix for systemd units (bug #604328)
Closes: https://bugs.gentoo.org/604328
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../{ceph-15.2.5.ebuild => ceph-14.2.11-r1.ebuild} | 30 ++++++++++------------
.../{ceph-15.2.5.ebuild => ceph-15.2.5-r1.ebuild} | 2 ++
.../ceph/files/ceph-14.2.11-systemd-unit-fix.patch | 27 +++++++++++++++++++
.../ceph/files/ceph-15.2.5-systemd-unit-fix.patch | 27 +++++++++++++++++++
4 files changed, 69 insertions(+), 17 deletions(-)
diff --git a/sys-cluster/ceph/ceph-15.2.5.ebuild b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
similarity index 93%
copy from sys-cluster/ceph/ceph-15.2.5.ebuild
copy to sys-cluster/ceph/ceph-14.2.11-r1.ebuild
index 942ffd88e77..35c24e6a41d 100644
--- a/sys-cluster/ceph/ceph-15.2.5.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
CMAKE_MAKEFILE_GENERATOR=emake
DISTUTILS_OPTIONAL=1
@@ -16,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"
@@ -28,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 libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl
+ spdk system-boost systemd +tcmalloc test xfs zfs"
IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
DEPEND="
@@ -45,7 +46,6 @@ DEPEND="
dev-libs/crypto++:=
dev-libs/leveldb:=[snappy,tcmalloc(-)?]
dev-libs/libaio:=
- dev-libs/libfmt:=
dev-libs/libnl:3=
dev-libs/libxml2:=
dev-libs/xmlsec:=[!openssl?,!libressl?]
@@ -92,7 +92,6 @@ DEPEND="
libressl? ( dev-libs/libressl:= )
)
system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
- uring? ( sys-libs/liburing:= )
xfs? ( sys-fs/xfsprogs:= )
zfs? ( sys-fs/zfs:= )
${PYTHON_DEPS}
@@ -128,7 +127,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
@@ -137,7 +135,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}]
@@ -146,7 +143,6 @@ 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}]
@@ -189,16 +185,19 @@ 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-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-missing-includes.patch"
+ "${FILESDIR}/ceph-14.2.10-python-warnings.patch"
+ "${FILESDIR}/ceph-14.2.10-build-without-mgr.patch"
+ "${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch"
)
check-reqs_export_vars() {
@@ -245,7 +244,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)
@@ -262,11 +260,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/ceph-15.2.5.ebuild b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-15.2.5.ebuild
rename to sys-cluster/ceph/ceph-15.2.5-r1.ebuild
index 942ffd88e77..e86923bb252 100644
--- a/sys-cluster/ceph/ceph-15.2.5.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
CMAKE_MAKEFILE_GENERATOR=emake
DISTUTILS_OPTIONAL=1
@@ -199,6 +200,7 @@ PATCHES=(
"${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-systemd-unit-fix.patch"
)
check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch
new file mode 100644
index 00000000000..7309fea029e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch
@@ -0,0 +1,27 @@
+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/lib/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
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
new file mode 100644
index 00000000000..a127ada181f
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch
@@ -0,0 +1,27 @@
+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