summary refs log tree commit diff
path: root/pkgs/servers/openafs
diff options
context:
space:
mode:
authorArtemis Tosini <me@artem.ist>2019-09-20 17:29:06 +0000
committerArtemis Tosini <me@artem.ist>2019-09-20 17:29:06 +0000
commit5acd6681f253c22ea58f63a38c41d1b338ed3105 (patch)
tree30c8b213d10aa4a206b3804728183daed9ea1eed /pkgs/servers/openafs
parent457e349423cf087612a0aa1e59b84772ebcfab98 (diff)
downloadnixpkgs-5acd6681f253c22ea58f63a38c41d1b338ed3105.tar
nixpkgs-5acd6681f253c22ea58f63a38c41d1b338ed3105.tar.gz
nixpkgs-5acd6681f253c22ea58f63a38c41d1b338ed3105.tar.bz2
nixpkgs-5acd6681f253c22ea58f63a38c41d1b338ed3105.tar.lz
nixpkgs-5acd6681f253c22ea58f63a38c41d1b338ed3105.tar.xz
nixpkgs-5acd6681f253c22ea58f63a38c41d1b338ed3105.tar.zst
nixpkgs-5acd6681f253c22ea58f63a38c41d1b338ed3105.zip
linuxPackages_5_3.openafs_1_8: fix build
This update cherry-picks patches necessary to build the OpenAFS kernel
module from the OpenAFS master branch. This commit does not fix OpenAFS
1.6.
Diffstat (limited to 'pkgs/servers/openafs')
-rw-r--r--pkgs/servers/openafs/1.8/module.nix16
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 95084458f47..d58d2bff813 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, which, autoconf, automake, flex, yacc
-, kernel, glibc, perl, libtool_2, kerberos }:
+, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }:
 
 with (import ./srcs.nix { inherit fetchurl; });
 
@@ -11,6 +11,20 @@ in stdenv.mkDerivation {
   name = "openafs-${version}-${kernel.modDirVersion}";
   inherit version src;
 
+  patches = [
+    # Linux 5.3
+    (fetchpatch {
+      name = "openafs_1_8-recurse-keyring_search.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=02d82275c17284d04629282aa374bb39f511c989";
+      sha256 = "03pkldwf6i67yf6i1705qp18rx5b0b342ryda8vfjw9lnvpinygs";
+    })
+    (fetchpatch {
+      name = "openafs_1_8-send-sig.patch";
+      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=2b7af1243f46496c0b5973b3fa2a6396243f7613";
+      sha256 = "13gyh5ncpp15dl7056gdzl5xhp2bmafc557bd2a4bwx9nyj53bag";
+    })
+  ];
+
   nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
     ++ kernel.moduleBuildDependencies;