diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:14:07 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:14:07 -0400 |
commit | ab53df106fb51b3dfa33629e882493f5a6705f7c (patch) | |
tree | 0e0c5465f78c29f5937406b28a8b9cdce19d5b68 /pkgs/os-specific/linux/kernel-headers | |
parent | b5a605c26908be611d189e7ea7dc6ec5c0f3aa09 (diff) | |
download | nixlib-ab53df106fb51b3dfa33629e882493f5a6705f7c.tar nixlib-ab53df106fb51b3dfa33629e882493f5a6705f7c.tar.gz nixlib-ab53df106fb51b3dfa33629e882493f5a6705f7c.tar.bz2 nixlib-ab53df106fb51b3dfa33629e882493f5a6705f7c.tar.lz nixlib-ab53df106fb51b3dfa33629e882493f5a6705f7c.tar.xz nixlib-ab53df106fb51b3dfa33629e882493f5a6705f7c.tar.zst nixlib-ab53df106fb51b3dfa33629e882493f5a6705f7c.zip |
Get the 3.3.5 kernel headers to build in the stdenv bootstrap
We don't have xz early in the bootstrap, so use the bz2 tarball. Also add SHELL=bash to get it to build.
Diffstat (limited to 'pkgs/os-specific/linux/kernel-headers')
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/3.3.5.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/default.nix | 66 |
2 files changed, 5 insertions, 71 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/3.3.5.nix b/pkgs/os-specific/linux/kernel-headers/3.3.5.nix index f4dd28dab031..c3d50578d91e 100644 --- a/pkgs/os-specific/linux/kernel-headers/3.3.5.nix +++ b/pkgs/os-specific/linux/kernel-headers/3.3.5.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { name = "linux-headers-${version}"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0i74jn47f6vs5kcvk8abvz3k08z32c9bbqw0sdjkdxwvr4jbczpv"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; + sha256 = "0144qc3ginldm2i6sy8g55y4k1yw3dy3dnl1hiv7v7rlqnljx5d5"; }; targetConfig = if (cross != null) then cross.config else null; @@ -33,15 +33,15 @@ stdenv.mkDerivation { extraIncludeDirs = 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 []; buildPhase = '' if test -n "$targetConfig"; then export ARCH=$platform fi - make ${kernelHeadersBaseConfig} - make mrproper headers_check + make ${kernelHeadersBaseConfig} SHELL=bash + make mrproper headers_check SHELL=bash ''; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix deleted file mode 100644 index f6004ccb1513..000000000000 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ /dev/null @@ -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"; - }; -} |