Skip to content

Commit 2a6bf99

Browse files
committed
linuxPackages.openafs: Patch for Linux kernel 6.12.
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 23e89b7 commit 2a6bf99

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

pkgs/servers/openafs/1.8/module.nix

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,32 @@ let
2020
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
2121
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
2222

23-
fetchBase64Patch = args: (fetchpatch args).overrideAttrs (o: {
24-
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
25-
});
26-
2723
in
2824
stdenv.mkDerivation {
2925
pname = "openafs";
3026
version = "${version}-${kernel.modDirVersion}";
3127
inherit src;
3228

33-
patches = [ ];
29+
patches = [
30+
# Linux: Define Clear/Set PageError macros as NOPs
31+
(fetchpatch {
32+
url = "https://gerrit.openafs.org/changes/15964/revisions/917d071a1b3c3e23c984ca8e5501ddccd62a01b6/patch";
33+
decode = "base64 -d";
34+
hash = "sha256-WqAHRN1YZj7Cz4X4iF1K3DJC1h8nXlnA9gveClL3KHc=";
35+
})
36+
# Linux: Refactor afs_linux_write_begin() variants
37+
(fetchpatch {
38+
url = "https://gerrit.openafs.org/changes/15965/revisions/c955b666b904b96620df10328a9a37c2fb5f2ed6/patch";
39+
decode = "base64 -d";
40+
hash = "sha256-U2W+8YrD1K7Pb/Jq08uBcuPnGkVvcSyTpwaWWcTbq0w=";
41+
})
42+
# Linux: Use folios for aops->write_begin/end
43+
(fetchpatch {
44+
url = "https://gerrit.openafs.org/changes/15966/revisions/d1706bdc5080b86b1876d10f062c369e8d898188/patch";
45+
decode = "base64 -d";
46+
hash = "sha256-jY+r9LO/4g6K9J1stxNCa38nyr1/J3beOhG9YilEbzg=";
47+
})
48+
];
3449

3550
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
3651
++ kernel.moduleBuildDependencies;

0 commit comments

Comments
 (0)