forked from mirrors/nixpkgs
linux-3.6: upgrade to 3.6.1
- enable aufs3 patch - check other patches needing upgrade/enable
This commit is contained in:
parent
2f39ec92e3
commit
8f480e3035
pkgs
|
@ -244,8 +244,7 @@ in
|
||||||
import ./generic.nix (
|
import ./generic.nix (
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
version = "3.6";
|
version = "3.6.1";
|
||||||
modDirVersion = "3.6.0";
|
|
||||||
testing = false;
|
testing = false;
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
@ -254,7 +253,7 @@ import ./generic.nix (
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||||
sha256 = "0kvqj6bhzcq581aav8mjzzxisz7s5vwng7b5kwzp2d8p3kpsdfaa";
|
sha256 = "0jpjhnp0pnly2nvfhb5z2wqaw66yzr9pd477rsdmx1wi9gsp07mz";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = configWithPlatform stdenv.platform;
|
config = configWithPlatform stdenv.platform;
|
||||||
|
|
|
@ -189,6 +189,21 @@ rec {
|
||||||
features.aufs3 = true;
|
features.aufs3 = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# not officially released yet, but 3.x seems to work fine
|
||||||
|
aufs3_6 = rec {
|
||||||
|
name = "aufs3.6";
|
||||||
|
version = "3.x.20120827";
|
||||||
|
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
|
||||||
|
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
|
||||||
|
patch = makeAufs3StandalonePatch {
|
||||||
|
inherit version;
|
||||||
|
rev = "46660ad144289fa1f0aca59bd00d592b560d0dbb";
|
||||||
|
sha256 = "823b7b4c011c103d63711900b3213008de3c9e408b909e0cc2b8697c1e82b67d";
|
||||||
|
};
|
||||||
|
features.aufsBase = true;
|
||||||
|
features.aufs3 = true;
|
||||||
|
};
|
||||||
|
|
||||||
# Increase the timeout on CIFS requests from 15 to 120 seconds to
|
# Increase the timeout on CIFS requests from 15 to 120 seconds to
|
||||||
# make CIFS more resilient to high load on the CIFS server.
|
# make CIFS more resilient to high load on the CIFS server.
|
||||||
cifs_timeout_2_6_15 =
|
cifs_timeout_2_6_15 =
|
||||||
|
@ -226,6 +241,7 @@ rec {
|
||||||
patch = ./dell-rfkill.patch;
|
patch = ./dell-rfkill.patch;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# seems no longer necessary on 3.6
|
||||||
perf3_5 =
|
perf3_5 =
|
||||||
{ name = "perf-3.5";
|
{ name = "perf-3.5";
|
||||||
patch = ./perf-3.5.patch;
|
patch = ./perf-3.5.patch;
|
||||||
|
|
|
@ -5870,8 +5870,7 @@ let
|
||||||
kernelPatches =
|
kernelPatches =
|
||||||
[
|
[
|
||||||
kernelPatches.sec_perm_2_6_24
|
kernelPatches.sec_perm_2_6_24
|
||||||
# kernelPatches.aufs3_5
|
kernelPatches.aufs3_6
|
||||||
# kernelPatches.perf3_5
|
|
||||||
] ++ lib.optionals (platform.kernelArch == "mips")
|
] ++ lib.optionals (platform.kernelArch == "mips")
|
||||||
[ kernelPatches.mips_fpureg_emu
|
[ kernelPatches.mips_fpureg_emu
|
||||||
kernelPatches.mips_fpu_sigill
|
kernelPatches.mips_fpu_sigill
|
||||||
|
|
Loading…
Reference in a new issue