pyrox.dev
linuxPackages.drbd: fix file collision (#307550)
+10
-6
pkgs/os-specific/linux/drbd/driver.nix
+10
-6
pkgs/os-specific/linux/drbd/driver.nix
···
26
26
# 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
27
27
installPhase = ''
28
28
runHook preInstall
29
-
install -D drbd/drbd.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd
30
-
install -D drbd/drbd_transport_tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd
31
-
install -D drbd/drbd_transport_lb-tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd
32
-
install -D drbd/drbd_transport_rdma.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd
29
+
install -D drbd/drbd.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9
30
+
install -D drbd/drbd_transport_tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9
31
+
install -D drbd/drbd_transport_lb-tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9
32
+
install -D drbd/drbd_transport_rdma.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9
33
33
${lib.optionalString (lib.versionOlder kernel.version "6.4") ''
34
-
install -D drbd/drbd-kernel-compat/handshake/handshake.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd
34
+
install -D drbd/drbd-kernel-compat/handshake/handshake.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9
35
35
''}
36
36
runHook postInstall
37
37
'';
···
41
41
substituteInPlace Makefile --replace 'SHELL=/bin/bash' 'SHELL=${builtins.getEnv "SHELL"}'
42
42
'';
43
43
44
+
# builder.pl had complained about the same file (drbd.ko.xz) provided by two different packages
45
+
# builder.pl also had complained about different permissions between the files from the two packages
46
+
# The compression is required because the kernel has the CONFIG_MODULE_COMPRESS_XZ option enabled
44
47
postFixup = ''
45
-
for ko in $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd/*.ko; do
48
+
for ko in $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9/*.ko; do
46
49
xz --compress -6 --threads=0 $ko
50
+
chmod 0444 $ko.xz
47
51
done
48
52
'';
49
53