alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fixing the correct handling of uboot in the initrd and the kernel derivations.

Browse source 
(nixos on sheevaplug)


svn path=/nixpkgs/trunk/; revision=20275
This commit is contained in:
Lluís Batlle i Rossell 2010-02-27 18:51:06 +00:00
parent 11aa65c28a
commit 3b747e92e5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/kernel/make-initrd.nix
View file

@ -16,7 +16,7 @@
let let
inputsFun = ubootName : [perl cpio] inputsFun = ubootName : [perl cpio]
++ stdenv.lib.optional (ubootName != null) [ ubootChooser ubootName ]; ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ];
makeUInitrdFun = ubootName : (ubootName != null); makeUInitrdFun = ubootName : (ubootName != null);
in in
stdenv.mkDerivation { stdenv.mkDerivation {

3
pkgs/os-specific/linux/kernel/generic.nix
View file

@ -40,6 +40,7 @@
kernelAutoModules = true; kernelAutoModules = true;
kernelTarget = "bzImage"; kernelTarget = "bzImage";
} }
, ubootChooser ? null
, ... , ...
}: }:
@ -82,7 +83,7 @@ stdenv.mkDerivation {
ignoreConfigErrors = (userModeLinux || platform.name != "pc"); ignoreConfigErrors = (userModeLinux || platform.name != "pc");
buildNativeInputs = [ perl mktemp ]; buildNativeInputs = [ perl mktemp ];
buildInputs = lib.optional (platform.uboot != null) platform.uboot; buildInputs = lib.optional (platform.uboot != null) (ubootChooser platform.uboot);
platformName = platform.name; platformName = platform.name;
kernelBaseConfig = platform.kernelBaseConfig; kernelBaseConfig = platform.kernelBaseConfig;