public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* ‘linuxHeaders’ shouldn't use the kernel sources from

Browse Source 
‘linuxPackages.kernel’, because then every minor kernel upgrade will
  cause a rebuild of everything.  So fix it at 2.6.35.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30857
This commit is contained in:
Eelco Dolstra 2011-12-12 18:51:11 +00:00
parent 8c23cd086f
commit f5fd808b51
4 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix
View File

@ -1,25 +0,0 @@
{stdenv, fetchurl, unifdef}:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "linux-headers-2.6.18.5";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.18.5.tar.bz2";
sha256 = "24f0e0011cdae42e3dba56107bb6a60c57c46d1d688a9b0300fec53e80fd1e53";
};
patches = [ ./unifdef-getline.patch ];
buildInputs = [ unifdef ];
platform =
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
abort "don't know what the kernel include directory is called for this platform";
extraIncludeDirs =
if stdenv.system == "powerpc-linux" then ["ppc"] else [];
}

9
pkgs/os-specific/linux/kernel-headers/builder.sh
View File

@ -1,9 +0,0 @@
source $stdenv/setup
patchPhase="sed -i '/scsi/d' include/Kbuild"
buildPhase="make mrproper headers_check";
installPhase="make INSTALL_HDR_PATH=$out headers_install"
genericBuild

9
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, fetchurl, perl, cross ? null, kernel}: { stdenv, fetchurl, perl, cross ? null }:
assert cross == null -> stdenv.isLinux; assert cross == null -> stdenv.isLinux;
let let
version = kernel.version; version = "2.6.35.14";
kernelHeadersBaseConfig = if (cross == null) then kernelHeadersBaseConfig = if (cross == null) then
stdenv.platform.kernelHeadersBaseConfig stdenv.platform.kernelHeadersBaseConfig
else else
@ -13,7 +13,10 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "linux-headers-${version}"; name = "linux-headers-${version}";
src = kernel.src; 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; targetConfig = if (cross != null) then cross.config else null;

15
pkgs/top-level/all-packages.nix
View File

@ -5330,16 +5330,7 @@ let
libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { }; libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { };
linuxHeaders = linuxHeaders = callPackage ../os-specific/linux/kernel-headers { };
let
kernel = {
src = linuxPackages.kernel.src;
version = linuxPackages.kernel.version;
};
in
callPackage ../os-specific/linux/kernel-headers { inherit kernel; };
linuxHeaders26Cross = 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;
@ -5359,12 +5350,8 @@ let
linuxHeadersCross = assert crossSystem != null; linuxHeadersCross = assert crossSystem != null;
linuxHeadersCrossChooser crossSystem.platform.kernelMajor; linuxHeadersCrossChooser crossSystem.platform.kernelMajor;
linuxHeaders_2_6_18 = callPackage ../os-specific/linux/kernel-headers/2.6.18.5.nix { };
linuxHeaders_2_6_28 = callPackage ../os-specific/linux/kernel-headers/2.6.28.nix { }; linuxHeaders_2_6_28 = callPackage ../os-specific/linux/kernel-headers/2.6.28.nix { };
linuxHeaders_2_6_32 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { };
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) { linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) {