Adding linux 2.4 kernel headers for cross builds.

(I'm thinking of OpenWRT machines out there, mips, with linux 2.4)

svn path=/nixpkgs/trunk/; revision=20539
This commit is contained in:
Lluís Batlle i Rossell 2010-03-10 20:44:48 +00:00
parent 57ea53f67a
commit 648b17197f
3 changed files with 23 additions and 5 deletions

View file

@ -5891,11 +5891,24 @@ let
linuxHeaders = linuxHeaders_2_6_28; linuxHeaders = linuxHeaders_2_6_28;
linuxHeadersCross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
inherit stdenv fetchurl perl; inherit stdenv fetchurl perl;
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
}); });
linuxHeaders24Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
inherit stdenv fetchurl perl;
cross = assert crossSystem != null; crossSystem;
});
# We can choose:
linuxHeadersCrossChooser = ver : if (ver == "2.4") then linuxHeaders24Cross
else if (ver == "2.6") then linuxHeaders26Cross
else throw "Unknown linux kernel version";
linuxHeadersCross = assert crossSystem != null;
linuxHeadersCrossChooser crossSystem.platform.kernelMajor;
linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix { linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix {
inherit fetchurl stdenv unifdef; inherit fetchurl stdenv unifdef;
}; };

View file

@ -26,6 +26,7 @@ rec {
sheevaplug = { sheevaplug = {
name = "sheevaplug"; name = "sheevaplug";
kernelMajor = "2.6";
kernelHeadersBaseConfig = "kirkwood_defconfig"; kernelHeadersBaseConfig = "kirkwood_defconfig";
kernelBaseConfig = "kirkwood_defconfig"; kernelBaseConfig = "kirkwood_defconfig";
kernelArch = "arm"; kernelArch = "arm";
@ -69,6 +70,7 @@ rec {
versatileARM = { versatileARM = {
name = "versatileARM"; name = "versatileARM";
kernelMajor = "2.6";
kernelHeadersBaseConfig = "versatile_defconfig"; kernelHeadersBaseConfig = "versatile_defconfig";
kernelBaseConfig = "versatile_defconfig"; kernelBaseConfig = "versatile_defconfig";
kernelArch = "arm"; kernelArch = "arm";
@ -106,6 +108,7 @@ rec {
integratorCP = { integratorCP = {
name = "integratorCP"; name = "integratorCP";
kernelMajor = "2.6";
kernelHeadersBaseConfig = "integrator_defconfig"; kernelHeadersBaseConfig = "integrator_defconfig";
kernelBaseConfig = "integrator_defconfig"; kernelBaseConfig = "integrator_defconfig";
kernelArch = "arm"; kernelArch = "arm";

View file

@ -80,20 +80,21 @@ let
arch = "mips"; arch = "mips";
float = "soft"; float = "soft";
withTLS = true; withTLS = true;
libc = "glibc"; libc = "uclibc";
platform = { platform = {
name = "malta"; name = "malta";
kernelMajor = "2.4";
kernelBaseConfig = "malta_defconfig"; kernelBaseConfig = "malta_defconfig";
kernelHeadersBaseConfig = "malta_defconfig"; kernelHeadersBaseConfig = "defconfig-malta";
uboot = null; uboot = null;
kernelArch = "mips"; kernelArch = "mips";
kernelAutoModules = false; kernelAutoModules = false;
kernelTarget = "vmlinux.bin"; kernelTarget = "vmlinux";
}; };
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
}; };
in { in {
crossMipselLinux = mapTestOnCross crossSystem basic; crossMipselLinux24 = mapTestOnCross crossSystem basic;
}) // ( }) // (
/* Test some cross builds to the ultrasparc */ /* Test some cross builds to the ultrasparc */
@ -108,6 +109,7 @@ let
libc = "glibc"; libc = "glibc";
platform = { platform = {
name = "ultrasparc"; name = "ultrasparc";
kernelMajor = "2.6";
kernelHeadersBaseConfig = "sparc64_defconfig"; kernelHeadersBaseConfig = "sparc64_defconfig";
kernelBaseConfig = "sparc64_defconfig"; kernelBaseConfig = "sparc64_defconfig";
kernelArch = "sparc"; kernelArch = "sparc";