* Use the Linux 2.6.32 kernel headers.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19552
This commit is contained in:
Eelco Dolstra 2010-01-19 18:02:37 +00:00
parent cea86564ff
commit 93b250b960
3 changed files with 61 additions and 6 deletions

View file

@ -2,9 +2,7 @@
assert stdenv.isLinux;
let
version = "2.6.28.5";
in
let version = "2.6.28.5"; in
stdenv.mkDerivation {
name = "linux-headers-${version}";
@ -22,8 +20,7 @@ stdenv.mkDerivation {
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.system == "armv5tel-linux" then "arm" else
abort "don't know what the kernel include directory is called for this
platform";
abort "don't know what the kernel include directory is called for this platform";
buildInputs = [perl];

View file

@ -0,0 +1,54 @@
{stdenv, fetchurl, perl, cross ? null}:
assert stdenv.isLinux;
let version = "2.6.32.4"; in
stdenv.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1n8pj05sazxv1dgi68q61lrvrnzvvx61qqw6kx80vqizqanz97z1";
};
targetConfig = if (cross != null) then cross.config else null;
platform =
if cross != null then cross.arch else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.system == "armv5tel-linux" then "arm" else
abort "don't know what the kernel include directory is called for this platform";
buildInputs = [perl];
extraIncludeDirs =
if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
buildPhase = ''
if test -n "$targetConfig"; then
export ARCH=$platform
fi
make mrproper headers_check
'';
installPhase = ''
make INSTALL_HDR_PATH=$out headers_install
# Some builds (e.g. KVM) want a kernel.release.
ensureDir $out/include/config
echo "${version}-default" > $out/include/config/kernel.release
'';
# !!! hacky
fixupPhase = ''
ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86
fi
'';
}

View file

@ -5693,7 +5693,7 @@ let
inherit fetchurl stdenv bison flex;
};
linuxHeaders = linuxHeaders_2_6_28;
linuxHeaders = linuxHeaders_2_6_32;
linuxHeadersCross = cross : forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.28.nix {
inherit stdenv fetchurl cross perl;
@ -5707,6 +5707,10 @@ let
inherit fetchurl stdenv perl;
};
linuxHeaders_2_6_32 = import ../os-specific/linux/kernel-headers/2.6.32.nix {
inherit fetchurl stdenv perl;
};
linuxHeadersArm = import ../os-specific/linux/kernel-headers-cross {
inherit fetchurl stdenv;
cross = "arm-linux";