Skip to content

ceph: compile with systemd support flag #440226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nh2 merged 1 commit into from
Oct 26, 2025
Merged

ceph: compile with systemd support flag #440226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion pkgs/by-name/ce/ceph/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@

# Linux Only Dependencies
linuxHeaders,
systemd,
util-linux,
libuuid,
udev,
Expand All @@ -117,6 +118,7 @@
libxfs ? null,
liburing ? null,
zfs ? null,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
}:

# We must have one crypto library
Expand Down Expand Up @@ -402,6 +404,20 @@ stdenv.mkDerivation {
url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch";
hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw=";
})

# See:
# * <https://github.com/ceph/ceph/pull/55560>
# * <https://github.com/ceph/ceph/pull/60575>
(fetchpatch2 {
name = "ceph-systemd-sans-cluster-name.patch";
url = "https://github.com/ceph/ceph/commit/5659920c7c128cb8d9552580dbe23dd167a56c31.patch?full_index=1";
hash = "sha256-Uch8ZghyTowUvSq0p/RxiVpdG1Yqlww9inpVksO6zyk=";
})
(fetchpatch2 {
name = "ceph-systemd-prefix.patch";
url = "https://github.com/ceph/ceph/commit/9b38df488d7101b02afa834ea518fd52076d582a.patch?full_index=1";
hash = "sha256-VcbJhCGTUdNISBd6P96Mm5M3fFVmZ8r7pMl+srQmnIQ=";
})
];

nativeBuildInputs = [
Expand Down Expand Up @@ -519,6 +535,9 @@ stdenv.mkDerivation {
substituteInPlace src/client/fuse_ll.cc \
--replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"

substituteInPlace systemd/*.service.in \
--replace-quiet "/bin/kill" "${util-linux}/bin/kill"

substituteInPlace src/{ceph-osd-prestart.sh,ceph-post-file.in,init-ceph.in} \
--replace-fail "GETOPT=/usr/local/bin/getopt" "GETOPT=${getopt}/bin/getopt" \
--replace-fail "GETOPT=getopt" "GETOPT=${getopt}/bin/getopt"
Expand All @@ -532,7 +551,8 @@ stdenv.mkDerivation {
"-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"

"-DWITH_CEPHFS_SHELL:BOOL=ON"
"-DWITH_SYSTEMD:BOOL=OFF"
"-DWITH_SYSTEMD:BOOL=${if withSystemd then "ON" else "OFF"}"
"-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"
# `WITH_JAEGER` requires `thrift` as a depenedncy (fine), but the build fails with:
# CMake Error at src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-Release.cmake:49 (message):
# Command failed: 2
Expand Down
Loading