diff options
author | lassulus <github@lassul.us> | 2024-04-12 21:53:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-12 21:53:55 +0200 |
commit | ad4c8244f1b1f98faae8e1059d38e501823b8253 (patch) | |
tree | 876c14c763d5e12d0c054c39a781c88015590b79 /pkgs/os-specific | |
parent | 250886da9b8052118037eae3f7799d33a71174e3 (diff) | |
parent | 6ed0323361dbd5fe508f6687ea6d346f05fa88b8 (diff) |
Merge pull request #278984 from birkb/drbd-kernel-module
drbd: 9.19.1 -> 9.27.0 (utils), 9.2.7 kernel driver added
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/drbd/driver.nix | 57 | ||||
-rw-r--r-- | pkgs/os-specific/linux/drbd/utils.nix (renamed from pkgs/os-specific/linux/drbd/default.nix) | 15 |
2 files changed, 68 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix new file mode 100644 index 0000000000000..efc771905e53a --- /dev/null +++ b/pkgs/os-specific/linux/drbd/driver.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, fetchurl, kernel, flex, coccinelle, python3 }: + +stdenv.mkDerivation rec { + name = "drbd-${version}-${kernel.version}"; + version = "9.2.7"; + + src = fetchurl { + url = "https://pkg.linbit.com//downloads/drbd/9/drbd-${version}.tar.gz"; + sha256 = "1355ns10z0fjgqsdpf09qfy01j8lg2n7zy4kclmar3s798n3mh56"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = [ + kernel.moduleBuildDependencies + flex + coccinelle + python3 + ]; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "SPAAS=false" + ]; + + # 6.4 and newer provide a in-tree version of the handshake module https://www.kernel.org/doc/html/v6.4/networking/tls-handshake.html + installPhase = '' + runHook preInstall + install -D drbd/drbd.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + install -D drbd/drbd_transport_tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + install -D drbd/drbd_transport_lb-tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + install -D drbd/drbd_transport_rdma.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + ${lib.optionalString (lib.versionOlder kernel.version "6.4") '' + install -D drbd/drbd-kernel-compat/handshake/handshake.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + ''} + runHook postInstall + ''; + + postPatch = '' + patchShebangs . + substituteInPlace Makefile --replace 'SHELL=/bin/bash' 'SHELL=${builtins.getEnv "SHELL"}' + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/LINBIT/drbd"; + description = "LINBIT DRBD kernel module"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ birkb ]; + longDescription = '' + DRBD is a software-based, shared-nothing, replicated storage solution + mirroring the content of block devices (hard disks, partitions, logical volumes, and so on) between hosts. + ''; + }; +} diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/utils.nix index 0c5acd0ac0645..ad50c2c3e50a5 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/utils.nix @@ -10,7 +10,9 @@ , libxslt , nixosTests , perl +, perlPackages , systemd +, keyutils # drbd-utils are compiled twice, once with forOCF = true to extract # its OCF definitions for use in the ocf-resource-agents derivation, @@ -22,11 +24,11 @@ stdenv.mkDerivation rec { pname = "drbd"; - version = "9.19.1"; + version = "9.27.0"; src = fetchurl { url = "https://pkg.linbit.com/downloads/drbd/utils/${pname}-utils-${version}.tar.gz"; - sha256 = "1l99kcrb0j85wxxmrdihpx9bk1a4sdi7wlp5m1x5l24k8ck1m5cf"; + sha256 = "1qwdrjrgas8z8vc6c85xcrqaczjwyqd61yig01n44wa5z0j3v4aq"; }; nativeBuildInputs = [ @@ -34,11 +36,12 @@ stdenv.mkDerivation rec { libxslt docbook_xsl asciidoctor + keyutils ]; buildInputs = [ perl - # perlPackages.Po4a used by ja documentation + perlPackages.Po4a ]; configureFlags = [ @@ -123,6 +126,10 @@ stdenv.mkDerivation rec { description = "Distributed Replicated Block Device, a distributed storage system for Linux (userspace utilities)"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ryantm astro ]; + maintainers = with maintainers; [ ryantm astro birkb ]; + longDescription = '' + DRBD is a software-based, shared-nothing, replicated storage solution + mirroring the content of block devices (hard disks, partitions, logical volumes, and so on) between hosts. + ''; }; } |