From 8b9f510b0866ad2d91139a09a7db35bdbf4af89b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 23 Sep 2009 20:51:00 +0000
Subject: [PATCH] Removing grub from the system expression for armv5tel-linux.

svn path=/nixos/trunk/; revision=17392
---
 modules/config/system-path.nix          | 4 ++--
 modules/system/activation/top-level.nix | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 3752528572d0..7f24bd041083 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -27,7 +27,6 @@ let
       pkgs.gnupatch
       pkgs.gnused
       pkgs.gnutar
-      pkgs.grub
       pkgs.gzip
       pkgs.host
       pkgs.iputils
@@ -60,7 +59,8 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-    ] ++ config.environment.extraPackages;
+    ] ++ optional (pkgs.stdenv.system != "armv5tel-linux") [ pkgs.grub ]
+    ++ config.environment.extraPackages;
 
 
   options = {
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 194575134734..96e9e289d30e 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -36,8 +36,10 @@ let
     ''
       ensureDir $out
 
-      ln -s ${config.boot.kernelPackages.kernel}/vmlinuz $out/kernel
-      ln -s $grub $out/grub
+      ln -s ${config.boot.kernelPackages.kernel}/uImage $out/kernel
+      if [ -n "$grub" ]; then 
+        ln -s $grub $out/grub
+      fi
       ln -s ${config.system.build.bootStage2} $out/init
       ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
       ln -s ${config.system.activationScripts.script} $out/activate
@@ -71,7 +73,8 @@ let
     name = "system";
     buildCommand = systemBuilder;
     inherit children;
-    inherit (pkgs) grub;
+    grub = if (pkgs.stdenv.system != "armv5tel-linux") then pkgs.grub
+      else null;
     grubDevice = config.boot.grubDevice;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;