public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing grub from the system expression for armv5tel-linux.

Browse Source 
svn path=/nixos/trunk/; revision=17392
This commit is contained in:
Lluís Batlle i Rossell 2009-09-23 20:51:00 +00:00
parent b2334990db
commit 8b9f510b08
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/config/system-path.nix
View File

@ -27,7 +27,6 @@ let
pkgs.gnupatch pkgs.gnupatch
pkgs.gnused pkgs.gnused
pkgs.gnutar pkgs.gnutar
pkgs.grub
pkgs.gzip pkgs.gzip
pkgs.host pkgs.host
pkgs.iputils pkgs.iputils
@ -60,7 +59,8 @@ let
pkgs.usbutils pkgs.usbutils
pkgs.utillinux pkgs.utillinux
pkgs.wirelesstools pkgs.wirelesstools
] ++ config.environment.extraPackages; ] ++ optional (pkgs.stdenv.system != "armv5tel-linux") [ pkgs.grub ]
++ config.environment.extraPackages;
options = { options = {

7
modules/system/activation/top-level.nix
View File

@ -36,8 +36,10 @@ let
'' ''
ensureDir $out ensureDir $out
ln -s ${config.boot.kernelPackages.kernel}/vmlinuz $out/kernel ln -s ${config.boot.kernelPackages.kernel}/uImage $out/kernel
if [ -n "$grub" ]; then
ln -s $grub $out/grub ln -s $grub $out/grub
fi
ln -s ${config.system.build.bootStage2} $out/init ln -s ${config.system.build.bootStage2} $out/init
ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
ln -s ${config.system.activationScripts.script} $out/activate ln -s ${config.system.activationScripts.script} $out/activate
@ -71,7 +73,8 @@ let
name = "system"; name = "system";
buildCommand = systemBuilder; buildCommand = systemBuilder;
inherit children; inherit children;
inherit (pkgs) grub; grub = if (pkgs.stdenv.system != "armv5tel-linux") then pkgs.grub
else null;
grubDevice = config.boot.grubDevice; grubDevice = config.boot.grubDevice;
kernelParams = kernelParams =
config.boot.kernelParams ++ config.boot.extraKernelParams; config.boot.kernelParams ++ config.boot.extraKernelParams;