linuxPackages.drbd: fix file collision (#307550)

authored by Birk and committed by GitHub c2c2960d 7c65c2e2

+10 -6
+10 -6
pkgs/os-specific/linux/drbd/driver.nix
··· 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 installPhase = '' 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 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 35 ''} 36 runHook postInstall 37 ''; ··· 41 substituteInPlace Makefile --replace 'SHELL=/bin/bash' 'SHELL=${builtins.getEnv "SHELL"}' 42 ''; 43 44 postFixup = '' 45 - for ko in $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd/*.ko; do 46 xz --compress -6 --threads=0 $ko 47 done 48 ''; 49
··· 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 installPhase = '' 28 runHook preInstall 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 ${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/drbd9 35 ''} 36 runHook postInstall 37 ''; ··· 41 substituteInPlace Makefile --replace 'SHELL=/bin/bash' 'SHELL=${builtins.getEnv "SHELL"}' 42 ''; 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 47 postFixup = '' 48 + for ko in $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9/*.ko; do 49 xz --compress -6 --threads=0 $ko 50 + chmod 0444 $ko.xz 51 done 52 ''; 53