mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

Get the 3.3.5 kernel headers to build in the stdenv bootstrap

Browse source 
We don't have xz early in the bootstrap, so use the bz2 tarball.  Also
add SHELL=bash to get it to build.
This commit is contained in:
Eelco Dolstra 2012-09-26 14:14:07 -04:00
parent b5a605c269
commit ab53df106f
3 changed files with 6 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel-headers/3.3.5.nix
View file

@ -14,8 +14,8 @@ stdenv.mkDerivation {
name = "linux-headers-${version}"; name = "linux-headers-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
sha256 = "0i74jn47f6vs5kcvk8abvz3k08z32c9bbqw0sdjkdxwvr4jbczpv"; sha256 = "0144qc3ginldm2i6sy8g55y4k1yw3dy3dnl1hiv7v7rlqnljx5d5";
}; };
targetConfig = if (cross != null) then cross.config else null; targetConfig = if (cross != null) then cross.config else null;
@ -33,15 +33,15 @@ stdenv.mkDerivation {
extraIncludeDirs = extraIncludeDirs =
if cross != null then if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else []) (if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else []; else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
buildPhase = '' buildPhase = ''
if test -n "$targetConfig"; then if test -n "$targetConfig"; then
export ARCH=$platform export ARCH=$platform
fi fi
make ${kernelHeadersBaseConfig} make ${kernelHeadersBaseConfig} SHELL=bash
make mrproper headers_check make mrproper headers_check SHELL=bash
''; '';
installPhase = '' installPhase = ''

66
pkgs/os-specific/linux/kernel-headers/default.nix
View file

@ -1,66 +0,0 @@
{ stdenv, fetchurl, perl, cross ? null }:
assert cross == null -> stdenv.isLinux;
let
version = "2.6.35.14";
kernelHeadersBaseConfig = if cross == null then
stdenv.platform.kernelHeadersBaseConfig
else
cross.platform.kernelHeadersBaseConfig;
in
stdenv.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.35/linux-${version}.tar.bz2";
sha256 = "1wzml7s9karfbk2yi36g1r8fyaq4d4f16yizc68zgchv0xzj39zl";
};
targetConfig = if (cross != null) then cross.config else null;
platform =
if cross != null then cross.platform.kernelArch 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.isArm then "arm" else
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch 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 ${kernelHeadersBaseConfig}
make mrproper headers_check
'';
installPhase = ''
make INSTALL_HDR_PATH=$out headers_install
# Some builds (e.g. KVM) want a kernel.release.
mkdir -p $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
'';
passthru = {
versionForGlibc = "2.6.35";
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -5642,7 +5642,7 @@ let
libnl = callPackage ../os-specific/linux/libnl { }; libnl = callPackage ../os-specific/linux/libnl { };
linuxHeaders = callPackage ../os-specific/linux/kernel-headers { }; linuxHeaders = linuxHeaders33;
linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { }; linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { };