Merge pull request #198992 from lovesegfault/kernel-drop-eol
This commit is contained in:
commit
c459a3638a
|
@ -30,7 +30,7 @@ let
|
||||||
linux_5_4_hardened
|
linux_5_4_hardened
|
||||||
linux_5_10_hardened
|
linux_5_10_hardened
|
||||||
linux_5_15_hardened
|
linux_5_15_hardened
|
||||||
linux_5_19_hardened
|
linux_6_0_hardened
|
||||||
|
|
||||||
linux_testing;
|
linux_testing;
|
||||||
};
|
};
|
||||||
|
|
|
@ -39,16 +39,6 @@
|
||||||
"sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh",
|
"sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh",
|
||||||
"version": "5.15.76"
|
"version": "5.15.76"
|
||||||
},
|
},
|
||||||
"5.19": {
|
|
||||||
"patch": {
|
|
||||||
"extra": "-hardened1",
|
|
||||||
"name": "linux-hardened-5.19.17-hardened1.patch",
|
|
||||||
"sha256": "0fs9zdwxbcc3fi4w1qylvvv387ih3g0dnagw5pvq3r2k2g5fflya",
|
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.17-hardened1/linux-hardened-5.19.17-hardened1.patch"
|
|
||||||
},
|
|
||||||
"sha256": "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9",
|
|
||||||
"version": "5.19.17"
|
|
||||||
},
|
|
||||||
"5.4": {
|
"5.4": {
|
||||||
"patch": {
|
"patch": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
buildLinux (args // rec {
|
|
||||||
version = "5.19.17";
|
|
||||||
|
|
||||||
# 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 = "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9";
|
|
||||||
};
|
|
||||||
} // (args.argsOverride or { }))
|
|
|
@ -1,9 +1,9 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, kernel
|
, kernel
|
||||||
, commitDate ? "2022-09-28"
|
, commitDate ? "2022-10-31"
|
||||||
, currentCommit ? "24c6361e202cc09de0159505eb3ab3ca265520d8"
|
, currentCommit ? "77c27f28aa58e9d9037eb68c87d3283f68c371f7"
|
||||||
, diffHash ? "sha256-Y3uKkVMCaLGJpYb27ef3FfbqEQ32mgCVpWtYzvYamr8="
|
, diffHash ? "sha256-TUpI9z0ac3rjn2oT5Z7oQXevDKbGwTVjyigS5/aGwgQ="
|
||||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
||||||
, argsOverride ? {}
|
, argsOverride ? {}
|
||||||
, ...
|
, ...
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
, enablePython ? true
|
, enablePython ? true
|
||||||
|
|
||||||
# for determining the latest compatible linuxPackages
|
# for determining the latest compatible linuxPackages
|
||||||
, linuxPackages_5_19 ? pkgs.linuxKernel.packages.linux_5_19
|
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
|
||||||
, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0
|
, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -218,7 +218,7 @@ in {
|
||||||
zfsStable = common {
|
zfsStable = common {
|
||||||
# check the release notes for compatible kernels
|
# check the release notes for compatible kernels
|
||||||
kernelCompatible = kernel.kernelOlder "5.20";
|
kernelCompatible = kernel.kernelOlder "5.20";
|
||||||
latestCompatibleLinuxPackages = linuxPackages_5_19;
|
latestCompatibleLinuxPackages = linuxPackages_5_15;
|
||||||
|
|
||||||
# this package should point to the latest release.
|
# this package should point to the latest release.
|
||||||
version = "2.1.6";
|
version = "2.1.6";
|
||||||
|
|
|
@ -166,12 +166,7 @@ in {
|
||||||
|
|
||||||
linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||||
|
|
||||||
linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix {
|
linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||||
kernelPatches = [
|
|
||||||
kernelPatches.bridge_stp_helper
|
|
||||||
kernelPatches.request_key_helper
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix {
|
linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix {
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
|
@ -193,7 +188,7 @@ in {
|
||||||
else testing;
|
else testing;
|
||||||
|
|
||||||
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
||||||
kernel = linux_5_19;
|
kernel = linux_6_0;
|
||||||
kernelPatches = kernel.kernelPatches;
|
kernelPatches = kernel.kernelPatches;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -248,7 +243,7 @@ in {
|
||||||
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
||||||
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
||||||
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||||
linux_5_19_hardened = hardenedKernelFor kernels.linux_5_19 { };
|
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||||
linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };
|
linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };
|
||||||
|
|
||||||
}));
|
}));
|
||||||
|
@ -535,7 +530,7 @@ in {
|
||||||
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
|
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
|
||||||
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
|
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
|
||||||
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
|
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
|
||||||
linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19);
|
linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01
|
||||||
linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0);
|
linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -575,7 +570,7 @@ in {
|
||||||
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
|
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
|
||||||
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
|
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
|
||||||
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||||
linux_5_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_19 { });
|
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||||
linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });
|
linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });
|
||||||
|
|
||||||
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
||||||
|
|
Loading…
Reference in a new issue