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

linux_4_14: remove

Browse Source
This commit is contained in:
ajs124 2023-10-11 13:09:41 +02:00
parent 2d1830dc22
commit 89e976973b
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/kernel-generic.nix
View File

@ -25,7 +25,6 @@ let
}) args);
kernels = pkgs.linuxKernel.vanillaPackages // {
inherit (pkgs.linuxKernel.packages)
linux_4_14_hardened
linux_4_19_hardened
linux_5_4_hardened
linux_5_10_hardened

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

@ -28114,8 +28114,6 @@ with pkgs;
# hardened kernels
linuxPackages_hardened = linuxKernel.packages.linux_hardened;
linux_hardened = linuxPackages_hardened.kernel;
linuxPackages_4_14_hardened = linuxKernel.packages.linux_4_14_hardened;
linux_4_14_hardened = linuxPackages_4_14_hardened.kernel;
linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened;
linux_4_19_hardened = linuxPackages_4_19_hardened.kernel;
linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;

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

@ -96,18 +96,6 @@ in {
rpiVersion = 4;
};
linux_4_14 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "4.14";
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
];
};
linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "4.19";
kernelPatches =
@ -261,10 +249,6 @@ in {
linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 {
stdenv = gcc10Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
};
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 {
stdenv = gcc10Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
@ -280,6 +264,7 @@ in {
} // lib.optionalAttrs config.allowAliases {
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";
linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";
@ -590,7 +575,6 @@ in {
vanillaPackages = {
# recurse to build modules for the kernels
linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14);
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);
@ -599,6 +583,7 @@ in {
linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5);
} // lib.optionalAttrs config.allowAliases {
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08
linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01
linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20
@ -630,7 +615,6 @@ in {
linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
linux_4_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_14_hardened);
linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened);
linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened);
linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);