diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 6659fddf4cee..6613a8c15e24 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -506,6 +506,8 @@ The derivation now installs "impl" headers selectively instead of by a wildcard. Use `imgui.src` if you just want to access the unpacked sources. +- Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11 + - Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an unrestricted access to it can set `boot.kernel.sysctl."kernel.dmesg_restrict" = false`. diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 3e2302810ef0..e5d3b36642e7 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -25,7 +25,6 @@ let }) args); kernels = pkgs.linuxKernel.vanillaPackages // { inherit (pkgs.linuxKernel.packages) - linux_4_19_hardened linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened diff --git a/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch b/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch deleted file mode 100644 index 58a9191989ae..000000000000 --- a/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst -index 07650ee..934a7a8 100644 ---- a/scripts/Makefile.modinst -+++ b/scripts/Makefile.modinst -@@ -9,7 +9,8 @@ include scripts/Kbuild.include - - # - --__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) -+__modules := $(sort $(foreach f,$(wildcard $(MODVERDIR)/*.mod),$(shell \ -+ grep -h '\.ko$$' '$f'))) - modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) - - PHONY += $(modules) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5d4ebc214dc7..9e15991dd635 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -39,11 +39,6 @@ patch = ./request-key-helper-updated.patch; }; - modinst_arg_list_too_long = - { name = "modinst-arglist-too-long"; - patch = ./modinst-arg-list-too-long.patch; - }; - hardened = let mkPatch = kernelVersion: { version, sha256, patch }: let src = patch; in { name = lib.removeSuffix ".patch" src.name; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c874ee7429e3..7ac09d0b8a2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26172,8 +26172,6 @@ with pkgs; # hardened kernels linuxPackages_hardened = linuxKernel.packages.linux_hardened; linux_hardened = linuxPackages_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; linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index cbcee495efd8..9ce08e4cdbc0 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -97,15 +97,6 @@ in { rpiVersion = 4; }; - linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "4.19"; - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_5_4 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "5.4"; kernelPatches = [ @@ -268,10 +259,6 @@ in { linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; - linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }; linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { stdenv = gcc10Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; @@ -282,13 +269,8 @@ in { linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; } // 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"; - linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream"; - linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream"; + linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; linux_6_4 = throw "linux 6.4 was removed because it has reached its end of life upstream"; linux_6_5 = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7 = throw "linux 6.7 was removed because it has reached its end of life upstream"; @@ -297,9 +279,10 @@ in { linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; - linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; + linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; + linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; + linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream"; + linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; @@ -630,7 +613,6 @@ in { vanillaPackages = { # recurse to build modules for the kernels - 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_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); @@ -639,13 +621,8 @@ in { linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); } // 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 - linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26 - linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22 + linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02 linux_6_5 = throw "linux 6.5 was removed because it reached its end of life upstream"; # Added 2024-02-28 linux_6_7 = throw "linux 6.7 was removed because it reached its end of life upstream"; # Added 2024-04-04 @@ -676,7 +653,6 @@ in { linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_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); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); @@ -694,9 +670,10 @@ in { linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); __recurseIntoDerivationForReleaseJobs = true; } // lib.optionalAttrs config.allowAliases { - linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; + linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; + linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; + linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream"; + linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";