diff options
| author | Peter Simons <simons@cryp.to> | 2012-02-22 20:29:18 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-02-22 20:29:18 +0000 |
| commit | 9db68408140393ce0d3e7f922583ee7d7288d5c8 (patch) | |
| tree | 2e7d48fb29ed92a8851573555e859f8fb78a8736 | |
| parent | 4b8cceb57106bba5033d0cd5cb3f653e8b896d5a (diff) | |
| download | nixpkgs-9db68408140393ce0d3e7f922583ee7d7288d5c8.tar nixpkgs-9db68408140393ce0d3e7f922583ee7d7288d5c8.tar.gz nixpkgs-9db68408140393ce0d3e7f922583ee7d7288d5c8.tar.bz2 nixpkgs-9db68408140393ce0d3e7f922583ee7d7288d5c8.tar.lz nixpkgs-9db68408140393ce0d3e7f922583ee7d7288d5c8.tar.xz nixpkgs-9db68408140393ce0d3e7f922583ee7d7288d5c8.tar.zst nixpkgs-9db68408140393ce0d3e7f922583ee7d7288d5c8.zip | |
linux kernel 3.2 : added aufs patches
svn path=/nixpkgs/trunk/; revision=32483
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9fb597be72c..59a8f794e17 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -322,6 +322,20 @@ rec { features.aufs3 = true; }; + aufs3_2 = rec { + name = "aufs3.2"; + version = "3.2"; + utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f"; + utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033"; + sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea"; + }; + features.aufsBase = true; + features.aufs3 = true; + }; + # Increase the timeout on CIFS requests from 15 to 120 seconds to # make CIFS more resilient to high load on the CIFS server. cifs_timeout_2_6_15 = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92e0f42ce4f..530c178f39a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5735,7 +5735,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - #kernelPatches.aufs3_1 + kernelPatches.aufs3_2 #kernelPatches.mips_restart_2_6_36 ]; }; |