public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux_mptcp: 0.90.1 (kernel 3.18) -> 0.91 (kernel 4.1) (#17675)

Browse Source
This commit is contained in:
Guillaume Maudoux 2016-08-12 15:14:24 +02:00 committed by Franz Pletz
parent bd20aaa767
commit b1817fa8a3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/linux-mptcp.nix
View File

@ -1,20 +1,22 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
mptcpVersion = "0.90.1"; mptcpVersion = "0.91";
modDirVersion = "3.18.25"; modDirVersion = "4.1.26";
version = "${modDirVersion}-mptcp_v${mptcpVersion}"; version = "${modDirVersion}-mptcp_v${mptcpVersion}";
extraMeta = { extraMeta = {
branch = "3.18"; branch = "4.1";
maintainers = stdenv.lib.maintainers.layus; maintainers = stdenv.lib.maintainers.layus;
}; };
src = fetchurl { src = fetchurl {
url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
sha256 = "088cpxl960xzrsz7x2lkq28ksa4gzjb1hp5yf8hxshihyhdaspwl"; sha256 = "0rbvgz89j5wk781y201qdxy2kz4gmlamb72wdbxj8mxv92x56lh3";
}; };
kernelPatches = args.kernelPatches;
extraConfig = '' extraConfig = ''
IPV6 y IPV6 y
MPTCP y MPTCP y

5
pkgs/top-level/all-packages.nix
View File

@ -11074,7 +11074,10 @@ in
klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
kernelPatches = [ kernelPatches.bridge_stp_helper ] kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.hiddev_CVE_2016_5829
]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill kernelPatches.mips_fpu_sigill