linux: Add 4.15

This commit is contained in:
Tim Steinbach 2018-01-29 11:41:02 -05:00
parent da26e92078
commit 61043ad4d1
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
2 changed files with 34 additions and 2 deletions

View File

@ -0,0 +1,18 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
with stdenv.lib;
import ./generic.nix (args // rec {
version = "4.15";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
};
} // (args.argsOverride or {}))

View File

@ -12837,7 +12837,6 @@ with pkgs;
kernelPatches = with kernelPatches; [
kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.tag_hardened
];
extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
@ -12924,6 +12923,21 @@ with pkgs;
];
};
linux_4_15 = callPackage ../os-specific/linux/kernel/linux-4.15.nix {
kernelPatches =
[ kernelPatches.bridge_stp_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
]
++ 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
@ -13112,7 +13126,7 @@ with pkgs;
linux = linuxPackages.kernel;
# Update this when adding the newest kernel major version!
linuxPackages_latest = linuxPackages_4_14;
linuxPackages_latest = linuxPackages_4_15;
linux_latest = linuxPackages_latest.kernel;
# Build the kernel modules for the some of the kernels.