Author: stordeur
Date: Mon Jul 11 13:59:40 2011
New Revision: 27709
URL: https://svn.nixos.org/websvn/nix/?rev=27709&sc=1
Log:
Suffixed cifs timeout patch with kernel version.
Currently suffixed with 2.6.32.
This pre-patch prepares the landing of several versions of this patch to
support other Linux kernel versions.
Added:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch
- copied, changed from r27708,
nixpkgs/trunk/pkgs/os-specific/linux/kernel/cifs-timeout.patch
Deleted:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/cifs-timeout.patch
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
Copied and modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch (from
r27708, nixpkgs/trunk/pkgs/os-specific/linux/kernel/cifs-timeout.patch)
==============================================================================
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Mon Jul 11
13:59:37 2011 (r27708)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Mon Jul 11
13:59:40 2011 (r27709)
@@ -38,7 +38,7 @@
in
-{
+rec {
sec_perm_2_6_24 =
{ name = "sec_perm-2.6.24";
@@ -55,7 +55,7 @@
extraConfig = fbcondecorConfig;
features.fbConDecor = true;
};
-
+
fbcondecor_2_6_27 =
{ name = "fbcondecor-0.9.4-2.6.27";
patch = fetchurl {
@@ -75,7 +75,7 @@
extraConfig = fbcondecorConfig;
features.fbConDecor = true;
};
-
+
fbcondecor_2_6_29 =
{ name = "fbcondecor-0.9.6-2.6.29.2";
patch = fetchurl {
@@ -85,7 +85,7 @@
extraConfig = fbcondecorConfig;
features.fbConDecor = true;
};
-
+
fbcondecor_2_6_31 =
{ name = "fbcondecor-0.9.6-2.6.31.2";
patch = fetchurl {
@@ -148,7 +148,7 @@
};
};
- gcov_2_6_28 =
+ gcov_2_6_28 =
{ name = "gcov";
patch = fetchurl {
url =
http://buildfarm.st.ewi.tudelft.nl/~eelco/dist/linux-2.6.28-gcov.patch;
@@ -235,12 +235,14 @@
# 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 =
+ cifs_timeout_2_6_32 =
{ name = "cifs-timeout";
- patch = ./cifs-timeout.patch;
+ patch = ./cifs-timeout-2.6.32.patch;
features.cifsTimeout = true;
};
+ cifs_timeout = cifs_timeout_2_6_32;
+
no_xsave =
{ name = "no-xsave";
patch = fetchurl {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
