Merge pull request #220979 from K900/kernels-20230313
Kernel updates for 20230313
This commit is contained in:
commit
86dcef07bf
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.308";
|
||||
version = "4.14.309";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "19lkw0izj0i63grzycvz6pdxvih0q7lml0h30zsxzb4vb7yj0v7i";
|
||||
sha256 = "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.276";
|
||||
version = "4.19.277";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1f8lcd47pba4jfycbbrd8vsqpf038x19rf80g3grzpvsgyaq1k1f";
|
||||
sha256 = "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.173";
|
||||
version = "5.10.174";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "099w115m2b1l99r4pn7ifjg6aqb8rsn888102qj8iv97qxsb901l";
|
||||
sha256 = "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.101";
|
||||
version = "5.15.102";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0bf0s3qw1k0p13f5cnircajfyr3j22yp9jx4l62iarxbn1k20fdr";
|
||||
sha256 = "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.235";
|
||||
version = "5.4.236";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1yqlvfw15mvmn6fh7gpck799pw4a2sip52ar9ammi0qdp96x1gxq";
|
||||
sha256 = "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.1.18";
|
||||
version = "6.1.19";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "07hlmv00wqi7497c3y6w7494qsxgd97kzy7xa30v0vqfzxgc2al4";
|
||||
sha256 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.2.5";
|
||||
version = "6.2.6";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "1fg5rq40fi7xkx3pw54538gydygbizg492aqfnh0hn3fry903av5";
|
||||
sha256 = "179x1fqgi3drg1q1xy0648hvy7cpc79yzn2r248rq4mprvbz3qhz";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
@ -62,13 +62,4 @@
|
|||
name = "fix-em-ice-bonding";
|
||||
patch = ./fix-em-ice-bonding.patch;
|
||||
};
|
||||
|
||||
# https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf
|
||||
fix-brcmfmac = {
|
||||
name = "fix-brcmfmac";
|
||||
patch = fetchpatch {
|
||||
url = "https://lore.kernel.org/linux-wireless/20230311141914.24444-1-marcan@marcan.st/raw";
|
||||
sha256 = "sha256-Fjap48Lef8Mi1i0t13/rT2SoYcbO8HJuXhJMn7HK3Ds=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -34,8 +34,6 @@ let
|
|||
major = lib.versions.major version;
|
||||
sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256;
|
||||
modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion;
|
||||
# FIXME remove as soon as the revert happened upstream!
|
||||
basePatches = lib.filter ({ name, ... }: name != "fix-brcmfmac") kernel.kernelPatches;
|
||||
in kernel.override {
|
||||
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
|
||||
inherit stdenv lib version;
|
||||
|
@ -51,7 +49,7 @@ let
|
|||
broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4");
|
||||
};
|
||||
};
|
||||
kernelPatches = basePatches ++ [
|
||||
kernelPatches = kernel.kernelPatches ++ [
|
||||
kernelPatches.hardened.${kernel.meta.branch}
|
||||
];
|
||||
isHardened = true;
|
||||
|
@ -106,7 +104,6 @@ in {
|
|||
# when adding a new linux version
|
||||
kernelPatches.cpu-cgroup-v2."4.11"
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.fix-brcmfmac
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -115,7 +112,6 @@ in {
|
|||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.fix-brcmfmac
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -124,7 +120,6 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.rtl8761b_support
|
||||
kernelPatches.fix-brcmfmac
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -139,7 +134,6 @@ in {
|
|||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-brcmfmac
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -156,7 +150,6 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.fix-brcmfmac
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -173,7 +166,6 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.fix-brcmfmac
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -182,7 +174,6 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.fix-brcmfmac
|
||||
];
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue