From 0eb9c5bd42ea4dc1c7efdd2d718aa0c5c24622d3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 19:08:02 +0200 Subject: [PATCH] linux_3_10: remove Support ends in Oct 2017 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 16 ---------------- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.10.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix deleted file mode 100644 index 9587ba356ff5..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.10.105"; - extraMeta.branch = "3.10"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1739mikbyfx1zfmra16lnprca3pcvcplqss4x1jzdqmvkh9cqnqw"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd97b2152fc4..0adf513cab35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12071,21 +12071,6 @@ with pkgs; ]; }; - linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { - kernelPatches = with kernelPatches; - [ bridge_stp_helper - p9_fixes - lguest_entry-linkage - packet_fix_race_condition_CVE_2016_8655 - DCCP_double_free_vulnerability_CVE-2017-6074 - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12314,7 +12299,6 @@ with pkgs; linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; - linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12);