colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux_5_14: remove

Browse Source 
https://lwn.net/ml/linux-kernel/1637500331152110@kroah.com/
https://github.com/openzfs/zfs/issues/12786
This commit is contained in:
TredwellGit 2021-11-26 23:19:20 +00:00 committed by Alyssa Ross
parent a93b636340
commit 04bbfd1b88
6 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -29,16 +29,6 @@
"sha256": "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg",
"version": "5.10.83"
},
"5.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.14.20-hardened1.patch",
"sha256": "0bnbwcayfcijgchnhyig9g9q334f4x1hwqns1zwg0wnsi3kxvcsb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.20-hardened1/linux-hardened-5.14.20-hardened1.patch"
},
"sha256": "0icb14xmwijcamqbnj3v16cl1awmjzhg9cniw5gwwk6la1d7aiwj",
"version": "5.14.20"
},
"5.15": {
"patch": {
"extra": "-hardened1",

18
pkgs/os-specific/linux/kernel/linux-5.14.nix
View File

@ -1,18 +0,0 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.14.21";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1cr381c179nfdrq95l4j56c4ygw09sxv493553ix4b80naf2a6pl";
};
} // (args.argsOverride or { }))

6
pkgs/os-specific/linux/zfs/default.nix
View File

@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_14 ? pkgs.linuxKernel.packages.linux_5_14
, linuxPackages_5_10 ? pkgs.linuxKernel.packages.linux_5_10
}:
with lib;
@ -216,7 +216,7 @@ in {
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_14;
latestCompatibleLinuxPackages = linuxPackages_5_10;
# this package should point to the latest release.
version = "2.1.1";
@ -227,7 +227,7 @@ in {
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_14;
latestCompatibleLinuxPackages = linuxPackages_5_10;
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the

2
pkgs/top-level/aliases.nix
View File

@ -481,7 +481,6 @@ mapAliases ({
linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
linuxPackages_5_14 = linuxKernel.packages.linux_5_14;
linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
@ -497,7 +496,6 @@ mapAliases ({
linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
linux_5_10 = linuxKernel.kernels.linux_5_10;
linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
linux_5_14 = linuxKernel.kernels.linux_5_14;
linux_5_15 = linuxKernel.kernels.linux_5_15;
# added 2020-04-04

2
pkgs/top-level/all-packages.nix
View File

@ -22245,8 +22245,6 @@ with pkgs;
linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened;
linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened;
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;

10
pkgs/top-level/linux-kernels.nix
View File

@ -159,13 +159,6 @@ in {
];
};
linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@ -229,7 +222,6 @@ in {
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { };
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
}));
@ -467,7 +459,6 @@ in {
linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);
linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14);
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
};
@ -497,7 +488,6 @@ in {
linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { });
linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { });
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { });
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);