Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
parent 28841f686c 83bfd42534
commit 2c5de61327
274 changed files with 8210 additions and 5384 deletions
@@ -197,5 +197,22 @@ in
    { name = "dell-rfkill";
      patch = ./dell-rfkill.patch;
    };
-  
+
+  guruplug_defconfig =
+    {
+      # Default configuration for the GuruPlug.  From
+      # <http://www.openplug.org/plugwiki/images/c/c6/Guruplug-patchset-2.6.33.2.tar.bz2>.
+      name = "guruplug-defconfig";
+      patch = ./guruplug-defconfig.patch;
+    };
+
+  guruplug_arch_number =
+    {
+      # Hack to match the `arch_number' of the U-Boot that ships with the
+      # GuruPlug.  This is only needed when using this specific U-Boot
+      # binary.  See
+      # <http://www.plugcomputer.org/plugwiki/index.php/Compiling_Linux_Kernel_for_the_Plug_Computer>.
+      name = "guruplug-arch-number";
+      patch = ./guruplug-mach-type.patch;
+    };
 }