git.iko.soy/typeable/nixpkgs
on master help sign in
openafs: Add upstream patches for Linux kernel 5.15

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

commitd4f4b721bcdb394749f072a2679ac06d580bc003 authorAnders Kaseorg <andersk@mit.edu> dateTue 2 Nov 2021, 18:06 (5 years ago) parentc935f5e
1 file changed+19−2
pkgs/servers/openafs/1.8/module.nix+19−2
pkgs/servers/openafs/1.8/module.nix+19−2
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
2−, kernel, glibc, perl, libtool_2, libkrb5 }:
2+, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
33
44with (import ./srcs.nix {
55 inherit fetchurl;
@@ -18,6 +18,23 @@ in stdenv.mkDerivation {
1818
1919 buildInputs = [ libkrb5 ];
2020
21+ patches = [
22+ # LINUX 5.14: explicitly set set_page_dirty to default
23+ ((fetchpatch {
24+ url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch";
25+ sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp";
26+ }).overrideAttrs (o: {
27+ postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
28+ }))
29+ # Linux 5.15: Convert osi_Msg macro to a function
30+ ((fetchpatch {
31+ url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch";
32+ sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g";
33+ }).overrideAttrs (o: {
34+ postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
35+ }))
36+ ];
37+
2138 hardeningDisable = [ "pic" ];
2239
2340 configureFlags = [
@@ -56,6 +73,6 @@ in stdenv.mkDerivation {
5673 license = licenses.ipl10;
5774 platforms = platforms.linux;
5875 maintainers = with maintainers; [ maggesi spacefrogg ];
59− broken = versionOlder kernel.version "3.18" || kernel.kernelAtLeast "5.15" || kernel.isHardened;
76+ broken = versionOlder kernel.version "3.18" || kernel.isHardened;
6077 };
6178}