b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #103232 from teto/mptcp_official

Browse source 
linux_mptcp_5_9: init upstream multipath TCP at 5.9
This commit is contained in:
Matthieu Coudron 2020-11-12 22:15:02 +01:00 committed by GitHub
parent e220cc0700 015939bece
commit 2bbfa82c2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
View file

@ -1,26 +0,0 @@
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
let
mptcpVersion = "0.94.6";
modDirVersion = "4.14.127";
in
buildLinux ({
version = "${modDirVersion}-mptcp_v${mptcpVersion}";
inherit modDirVersion;
extraMeta = {
branch = "4.4";
maintainers = with stdenv.lib.maintainers; [ teto layus ];
};
src = fetchFromGitHub {
owner = "multipath-tcp";
repo = "mptcp";
rev = "v${mptcpVersion}";
sha256 = "071cx9205wpzhi5gc2da79w2abs3czd60jg0xml7j1szc5wl4yfn";
};
structuredExtraConfig = stdenv.lib.mkMerge [
(import ./mptcp-config.nix { inherit stdenv; })
structuredExtraConfig
];
} // args)

17
pkgs/top-level/all-packages.nix
View file

@ -17987,18 +17987,11 @@ in
linux_mptcp = linux_mptcp_95;
linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
linux_mptcp_5_9 = linux_5_9.override {
structuredExtraConfig = with lib.kernel; {
MPTCP = yes;
MPTCP_IPV6 = yes;
};
};
linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {