From f454297a7d57f1996e1b5d351be0982fe6d617da Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Feb 2017 07:32:46 -0500 Subject: [PATCH] linux 4.10 --- pkgs/os-specific/linux/kernel/linux-4.10.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 19 ++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.10.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix new file mode 100644 index 000000000000..ff6fac2ac6d3 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.10"; + extraMeta.branch = "4.10"; + modDirVersion = "4.10.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c10c016ac4a..c1ca54b0587d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11334,6 +11334,22 @@ with pkgs; ]; }; + linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking + # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11506,7 +11522,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_9; + linuxPackages_latest = linuxPackages_4_10; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11517,6 +11533,7 @@ with pkgs; linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); + linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.