diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-18 21:10:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-18 21:10:46 +0000 |
| commit | 3d442ad185351acd900934baf1079a37a965ff54 (patch) | |
| tree | 7ac26b70403d844c8a11d28bf7894a1413fc457a | |
| parent | 113fa71b8c81c27182cf06bd2819fad6a22b86ee (diff) | |
| download | nixlib-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
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8322b6896465..f4d34584d250 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -7,9 +7,7 @@ rec { # The 15 second CIFS timeout is too short if the host if heavily # loaded (e.g., in the Hydra build farm when it's running many jobs # in parallel). So apply a patch to increase the timeout to 120s. - kernel = pkgs.linux.override (orig: { - kernelPatches = orig.kernelPatches ++ [ kernelPatches.cifs_timeout ]; - }); + kernel = assert pkgs.linux.features.cifsTimeout; pkgs.linux; kvm = pkgs.qemu_kvm; 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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0447c0c8fba0..b43a5e59582b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6472,6 +6472,8 @@ let [ kernelPatches.fbcondecor_2_6_31 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_2_6_32 + kernelPatches.cifs_timeout + kernelPatches.no_xsave ]; }; |