From 8f9c2f9726cbe39f01af25b4e4ac8c99d2462d7b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 24 Dec 2018 12:32:55 -0500 Subject: [PATCH] linux: Add 4.20 --- pkgs/os-specific/linux/kernel/linux-4.20.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.20.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix new file mode 100644 index 00000000000..838ef4a5b80 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.20"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # 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 = "0f14l6mb5c4rwpqjbcb2yrvk1bmmiyh0mpw24fbl7rr26lc2625d"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc999c3bc7c..8e0f19b4ab4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14561,6 +14561,16 @@ in ]; }; + linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.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 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14739,7 +14749,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_19; + linuxPackages_latest = linuxPackages_4_20; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -14749,6 +14759,7 @@ in linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); + linuxPackages_4_20 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_20); # When adding to this list: # - Update linuxPackages_latest to the latest version # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.