From f0e3e983776b148dc7a950a952865600ed7a43b2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 23 Jun 2022 11:09:16 +0200 Subject: [PATCH] linux_5_17: remove --- nixos/tests/kernel-generic.nix | 1 - .../linux/kernel/hardened/patches.json | 10 ---------- pkgs/os-specific/linux/kernel/linux-5.17.nix | 18 ------------------ pkgs/os-specific/linux/zfs/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/linux-kernels.nix | 13 +++---------- 6 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.17.nix diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 5e6682d1045d..04d52cf82e42 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,7 +30,6 @@ let linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened - linux_5_17_hardened linux_5_18_hardened linux_testing; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e3fb05060430..fb8c448f7fb8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -39,16 +39,6 @@ "sha256": "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j", "version": "5.15.49" }, - "5.17": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-5.17.15-hardened1.patch", - "sha256": "053zgg464rb8ca92hkzxqbffapmj0zs296af354b7jkgfpb5xzr1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.15-hardened1/linux-hardened-5.17.15-hardened1.patch" - }, - "sha256": "0a5n1lb43nhnhwjwclkk3dqp2nxsx5ny7zfl8idvzshf94m9472a", - "version": "5.17.15" - }, "5.18": { "patch": { "extra": "-hardened1", diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix deleted file mode 100644 index 6e4c5f6de14a..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.17.15"; - - # 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 = "0a5n1lb43nhnhwjwclkk3dqp2nxsx5ny7zfl8idvzshf94m9472a"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5a5fd2d19a8a..96c6f57b019a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_17 ? pkgs.linuxKernel.packages.linux_5_17 +, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 }: let @@ -217,7 +217,7 @@ in { zfsStable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_17; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to the latest release. version = "2.1.4"; @@ -228,7 +228,7 @@ in { zfsUnstable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_17; + latestCompatibleLinuxPackages = linuxPackages_5_15; # 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bfcb1a151bb..56c9eeaaa4fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23421,8 +23421,6 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; - linuxPackages_5_17_hardened = linuxKernel.packages.linux_5_17_hardened; - linux_5_17_hardened = linuxKernel.kernels.linux_5_17_hardened; linuxPackages_5_18_hardened = linuxKernel.packages.linux_5_18_hardened; linux_5_18_hardened = linuxKernel.kernels.linux_5_18_hardened; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 232843edf47a..a4a8c52e4cbf 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -162,12 +162,7 @@ in { linux_5_16 = throw "linux 5.16 was removed because it has reached its end of life upstream"; - linux_5_17 = callPackage ../os-specific/linux/kernel/linux-5.17.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix { kernelPatches = [ @@ -189,7 +184,7 @@ in { else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_17; + kernel = linux_5_18; kernelPatches = kernel.kernelPatches; }; @@ -243,7 +238,6 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; - linux_5_17_hardened = hardenedKernelFor kernels.linux_5_17 { }; linux_5_18_hardened = hardenedKernelFor kernels.linux_5_18 { }; })); @@ -515,7 +509,7 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 - linux_5_17 = recurseIntoAttrs (packagesFor kernels.linux_5_17); + linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18); }; @@ -555,7 +549,6 @@ in { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); - linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { }); linux_5_18_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_18 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);