* KVM 69. Seems to improve performance quite a bit. In particular it

  implements the host support for virtio devices in Linux >= 2.6.25
  guests.  Network performance shows a huge improvement with
  virtio_net, which should be good for the build farm (which uses
  Samba/CIFS to mount the file system of the host).
* Kernel headers for 2.6.26-rc5 added to build KVM 69.  Also added the
  2.6.25 headers, which turned out to be too old for KVM 69.

svn path=/nixpkgs/trunk/; revision=11985

2 files changed, 52 insertions, 0 deletions

diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix b/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix
new file mode 100644
index 000000000000..c6d1cc409fc3
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl}:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation {
+  name = "linux-headers-2.6.25.4";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.25.4.tar.bz2";
+    sha256 = "0hp36pwphw5rs9kwm5ksr7ynfmzgpcd8gi45rigbilvcvmsdnxf3";
+  };
+
+  platform = 
+    if stdenv.system == "i686-linux" then "i386" else
+    if stdenv.system == "x86_64-linux" then "x86_64" else
+    if stdenv.system == "powerpc-linux" then "powerpc" else
+    abort "don't know what the kernel include directory is called for this platform";
+
+  # !!! hacky
+  fixupPhase = "ln -s $out/include/asm $out/include/asm-$platform";
+
+  extraIncludeDirs =
+    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
+}
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.26-rc5.nix b/pkgs/os-specific/linux/kernel-headers/2.6.26-rc5.nix
new file mode 100644
index 000000000000..870b9a4c44c3
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.26-rc5.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl}:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation {
+  name = "linux-headers-2.6.26-pre-rc5";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v2.6/testing/linux-2.6.26-rc5.tar.bz2";
+    sha256 = "0mxhxiivm2dyca2shxnr3689x8f3l2vlmqdl80fm6lmq1b3j7k75";
+  };
+
+  platform = 
+    if stdenv.system == "i686-linux" then "i386" else
+    if stdenv.system == "x86_64-linux" then "x86_64" else
+    if stdenv.system == "powerpc-linux" then "powerpc" else
+    abort "don't know what the kernel include directory is called for this platform";
+
+  # !!! hacky
+  fixupPhase = "ln -s $out/include/asm $out/include/asm-$platform";
+
+  extraIncludeDirs =
+    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
+}