From 68db350b88bbeeb2b55b0c9045e503bf5cb39881 Mon Sep 17 00:00:00 2001 From: Ludovic Stordeur Date: Mon, 11 Jul 2011 13:59:51 +0000 Subject: [PATCH] Applied CIFS timeout patch to other Linux kernels CIFS timeout patch is now activated for a wider range of Linux kernels : from 2.6.29 to 2.6.38. These kernels now can be used to perform "VM Testing". svn path=/nixpkgs/trunk/; revision=27712 --- pkgs/top-level/all-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef104186ff52..2925e3e49534 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5087,6 +5087,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_29 kernelPatches.sec_perm_2_6_24 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5101,7 +5102,7 @@ let [ kernelPatches.fbcondecor_2_6_31 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_32 - kernelPatches.cifs_timeout + kernelPatches.cifs_timeout_2_6_29 kernelPatches.no_xsave kernelPatches.dell_rfkill ]; @@ -5159,6 +5160,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_33 kernelPatches.sec_perm_2_6_24 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5184,6 +5186,7 @@ let [ /*kernelPatches.fbcondecor_2_6_33*/ kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_34 + kernelPatches.cifs_timeout_2_6_29 ]; }; @@ -5199,6 +5202,7 @@ let [ #kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_35 + kernelPatches.cifs_timeout_2_6_35 ] ++ lib.optional (platform.kernelArch == "arm") kernelPatches.sheevaplug_modules_2_6_35; }; @@ -5227,6 +5231,7 @@ let kernelPatches.sec_perm_2_6_24 #kernelPatches.aufs2_2_6_35 kernelPatches.mips_restart_2_6_36 + kernelPatches.cifs_timeout_2_6_35 ]; }; @@ -5248,6 +5253,7 @@ let kernelPatches.sec_perm_2_6_24 #kernelPatches.aufs2_2_6_35 kernelPatches.mips_restart_2_6_36 + kernelPatches.cifs_timeout_2_6_35 ]; }; @@ -5263,6 +5269,7 @@ let [ kernelPatches.fbcondecor_2_6_37 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_37 + kernelPatches.cifs_timeout_2_6_35 #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5279,6 +5286,7 @@ let [ kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_38 + kernelPatches.cifs_timeout_2_6_38 #kernelPatches.mips_restart_2_6_36 ]; };