summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-07-18 21:10:46 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-07-18 21:10:46 +0000
commit3d442ad185351acd900934baf1079a37a965ff54 (patch)
tree7ac26b70403d844c8a11d28bf7894a1413fc457a /pkgs/os-specific
parent113fa71b8c81c27182cf06bd2819fad6a22b86ee (diff)
downloadnixlib-3d442ad185351acd900934baf1079a37a965ff54.tar
nixlib-3d442ad185351acd900934baf1079a37a965ff54.tar.gz
nixlib-3d442ad185351acd900934baf1079a37a965ff54.tar.bz2
nixlib-3d442ad185351acd900934baf1079a37a965ff54.tar.lz
nixlib-3d442ad185351acd900934baf1079a37a965ff54.tar.xz
nixlib-3d442ad185351acd900934baf1079a37a965ff54.tar.zst
nixlib-3d442ad185351acd900934baf1079a37a965ff54.zip
* Apply a patch that is apparently required to make the kernel work
  properly on Amazon EC2.
* Always apply the CIFS timeout patch.  It's rather annoying to have
  to build a separate kernel for the VM tests.

svn path=/nixpkgs/trunk/; revision=22630
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 45e3174dc804..12370c988799 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -160,6 +160,17 @@ in
   cifs_timeout =
     { name = "cifs-timeout";
       patch = ./cifs-timeout.patch;
+      features.cifsTimeout = true;
+    };
+
+  no_xsave =
+    { name = "no-xsave";
+      patch = fetchurl {
+        url = "http://cvs.fedoraproject.org/viewvc/devel/kernel/fix_xen_guest_on_old_EC2.patch?revision=1.1&view=co";
+        name = "no-xsave.patch";
+        sha256 = "02f51f9b636b105c81a3ed62145abdc0ecb043b8114eb10257854577f617f894";
+      };
+      features.noXsave = true;
     };
   
 }