diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-08 17:19:46 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-08 17:19:46 +0000 |
| commit | 7769ad11bdb1ac871d08c6ef9cc47321c53c053f (patch) | |
| tree | 02f6468af273232736b71cb15503512a4a8b5871 /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | 5eeac0d52ac8bb9db82a7fab4b0c4cbeded490b0 (diff) | |
| download | nixlib-7769ad11bdb1ac871d08c6ef9cc47321c53c053f.tar nixlib-7769ad11bdb1ac871d08c6ef9cc47321c53c053f.tar.gz nixlib-7769ad11bdb1ac871d08c6ef9cc47321c53c053f.tar.bz2 nixlib-7769ad11bdb1ac871d08c6ef9cc47321c53c053f.tar.lz nixlib-7769ad11bdb1ac871d08c6ef9cc47321c53c053f.tar.xz nixlib-7769ad11bdb1ac871d08c6ef9cc47321c53c053f.tar.zst nixlib-7769ad11bdb1ac871d08c6ef9cc47321c53c053f.zip | |
Updating the logic to put the resulting kernel image into its store path.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18289
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 31af236ffae6..0536b562612a 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -37,13 +37,17 @@ , preConfigure ? "" , extraMeta ? {} -, platform ? { uboot = null; } +, platform ? { name = "pc"; uboot = null; } , ... }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stdenv.system == "armv5tel-linux"; +assert platform.name == "sheevaplug" -> platform.uboot != null; +assert (platform.name == "sheevaplug" || platform.name == "versatileARM") -> + stdenv.system == "armv5tel-linux"; + let lib = stdenv.lib; @@ -75,6 +79,9 @@ stdenv.mkDerivation { buildInputs = [perl mktemp] ++ lib.optional (platform.uboot != null) [platform.uboot]; + + + platformName = platform.name; arch = if xen then "xen" else @@ -91,8 +98,6 @@ stdenv.mkDerivation { allowLocalVersion = false; # don't allow patches to set a suffix inherit localVersion; # but do allow the user to set one. - makeUImage = if (platform.uboot != null) then true else false; - meta = { description = (if userModeLinux then |