commit: a04c39465bd74ba1f7a8155001441384e09bccad
Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Tue Jan 20 15:19:47 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 25 06:45:34 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04c3946
sys-cluster/ceph: drop ceph-13.2.2-dont-install-sysvinit-script.patch
by remove ${ED}/etc/init.d/ceph in src_install().
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45459
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/ceph/ceph-19.2.2-r6.ebuild | 6 +++++-
sys-cluster/ceph/ceph-19.2.3.ebuild | 6 +++++-
sys-cluster/ceph/ceph-20.1.0-r2.ebuild | 6 +++++-
sys-cluster/ceph/ceph-20.1.1.ebuild | 6 +++++-
.../files/ceph-13.2.2-dont-install-sysvinit-script.patch | 15 ---------------
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/sys-cluster/ceph/ceph-19.2.2-r6.ebuild
b/sys-cluster/ceph/ceph-19.2.2-r6.ebuild
index 36cc4ca77ea7..b65e5bd3f5d7 100644
--- a/sys-cluster/ceph/ceph-19.2.2-r6.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.2-r6.ebuild
@@ -205,7 +205,6 @@ PATCHES=(
"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
"${FILESDIR}/ceph-14.2.0-cflags.patch"
"${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch"
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
@@ -465,6 +464,11 @@ src_install() {
find "${ED}" -name '*.la' -type f -delete || die
+ local bundled_init="${ED}/etc/init.d/ceph"
+ [[ -f "${bundled_init}" ]] && {
+ rm "${bundled_init}" || die
+ }
+
exeinto /usr/$(get_libdir)/ceph
newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
diff --git a/sys-cluster/ceph/ceph-19.2.3.ebuild
b/sys-cluster/ceph/ceph-19.2.3.ebuild
index 63a9f0a5432c..cdcaf8ecf913 100644
--- a/sys-cluster/ceph/ceph-19.2.3.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.3.ebuild
@@ -206,7 +206,6 @@ PATCHES=(
"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
"${FILESDIR}/ceph-14.2.0-cflags.patch"
"${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch"
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
@@ -464,6 +463,11 @@ src_install() {
find "${ED}" -name '*.la' -type f -delete || die
+ local bundled_init="${ED}/etc/init.d/ceph"
+ [[ -f "${bundled_init}" ]] && {
+ rm "${bundled_init}" || die
+ }
+
exeinto /usr/$(get_libdir)/ceph
newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
diff --git a/sys-cluster/ceph/ceph-20.1.0-r2.ebuild
b/sys-cluster/ceph/ceph-20.1.0-r2.ebuild
index 8e5d161f0927..33a1aec7db50 100644
--- a/sys-cluster/ceph/ceph-20.1.0-r2.ebuild
+++ b/sys-cluster/ceph/ceph-20.1.0-r2.ebuild
@@ -201,7 +201,6 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
"${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch"
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
@@ -442,6 +441,11 @@ src_install() {
find "${ED}" -name '*.la' -type f -delete || die
+ local bundled_init="${ED}/etc/init.d/ceph"
+ [[ -f "${bundled_init}" ]] && {
+ rm "${bundled_init}" || die
+ }
+
exeinto /usr/$(get_libdir)/ceph
newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
diff --git a/sys-cluster/ceph/ceph-20.1.1.ebuild
b/sys-cluster/ceph/ceph-20.1.1.ebuild
index 8e5d161f0927..33a1aec7db50 100644
--- a/sys-cluster/ceph/ceph-20.1.1.ebuild
+++ b/sys-cluster/ceph/ceph-20.1.1.ebuild
@@ -201,7 +201,6 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
"${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch"
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
@@ -442,6 +441,11 @@ src_install() {
find "${ED}" -name '*.la' -type f -delete || die
+ local bundled_init="${ED}/etc/init.d/ceph"
+ [[ -f "${bundled_init}" ]] && {
+ rm "${bundled_init}" || die
+ }
+
exeinto /usr/$(get_libdir)/ceph
newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
diff --git
a/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch
b/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch
deleted file mode 100644
index 4fbc8b6c8102..000000000000
--- a/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 874eabfaa1..e337f4cf8e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -601,10 +601,6 @@ install(PROGRAMS
- ${CMAKE_SOURCE_DIR}/src/ceph-run
- ${CMAKE_SOURCE_DIR}/src/ceph-clsinfo
- DESTINATION bin)
--install(PROGRAMS
-- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/init-ceph
-- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d
-- RENAME ceph)
-
- install(FILES
- ${CMAKE_SOURCE_DIR}/share/id_rsa_drop.ceph.com
