diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-19 12:12:24 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-19 12:12:24 +0000 |
| commit | 9ef11e4c4d18f124d88e5e63932de1182e4946e6 (patch) | |
| tree | daacbc10f2b2fd615ef15ee5c6a579a41e1022a7 /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | 5bae851b1e72065ba5a98366493954b3bc79c4ae (diff) | |
| download | nixlib-9ef11e4c4d18f124d88e5e63932de1182e4946e6.tar nixlib-9ef11e4c4d18f124d88e5e63932de1182e4946e6.tar.gz nixlib-9ef11e4c4d18f124d88e5e63932de1182e4946e6.tar.bz2 nixlib-9ef11e4c4d18f124d88e5e63932de1182e4946e6.tar.lz nixlib-9ef11e4c4d18f124d88e5e63932de1182e4946e6.tar.xz nixlib-9ef11e4c4d18f124d88e5e63932de1182e4946e6.tar.zst nixlib-9ef11e4c4d18f124d88e5e63932de1182e4946e6.zip | |
Made the linux kernel expressions support 'platform' again (thinking on reusing
most of the kernel expressions for the sheevaplug). I still have not added anything in the kernels about cross compilation. I moved the platform definitions out of all-packages. I have not written good platform definitions for the sheevaplug - only for the PC. Only the linux-2.6.32 expression uses the platforms kernelConfig. The linux-2.6.31 was broken, and I left it broken. svn path=/nixpkgs/branches/stdenv-updates/; revision=19046
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 6cc3ddc1228a..2d9af1b4bd83 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -33,7 +33,7 @@ , preConfigure ? "" , extraMeta ? {} -, platform ? { name = "pc"; uboot = null; } +, platform ? { name = "pc"; uboot = null; kernelBaseConfig = "defconfig"; } , ... }: @@ -80,13 +80,14 @@ stdenv.mkDerivation { ++ lib.optional (platform.uboot != null) [platform.uboot]; platformName = platform.name; + kernelBaseConfig = platform.kernelBaseConfig; arch = if xen then "xen" else if userModeLinux then "um" else + if platform ? kernelArch then platform.kernelArch else if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "armv5tel-linux" then "arm" else abort "Platform ${stdenv.system} is not supported."; meta = { |