From f5fd808b51ac034ee4b2148fd45e6ab614d3bb9f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Dec 2011 18:51:11 +0000 Subject: [PATCH] =?UTF-8?q?*=20=E2=80=98linuxHeaders=E2=80=99=20shouldn't?= =?UTF-8?q?=20use=20the=20kernel=20sources=20from=20=20=20=E2=80=98linuxPa?= =?UTF-8?q?ckages.kernel=E2=80=99,=20because=20then=20every=20minor=20kern?= =?UTF-8?q?el=20upgrade=20will=20=20=20cause=20a=20rebuild=20of=20everythi?= =?UTF-8?q?ng.=20=20So=20fix=20it=20at=202.6.35.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30857 --- .../linux/kernel-headers/2.6.18.5.nix | 25 ------------------- .../linux/kernel-headers/builder.sh | 9 ------- .../linux/kernel-headers/default.nix | 9 ++++--- pkgs/top-level/all-packages.nix | 15 +---------- 4 files changed, 7 insertions(+), 51 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix delete mode 100644 pkgs/os-specific/linux/kernel-headers/builder.sh diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix b/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix deleted file mode 100644 index 5ecdd77fb87..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix +++ /dev/null @@ -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 []; -} diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh deleted file mode 100644 index 05392d5fe24..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index bb2e6a28803..71b3b39baab 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, perl, cross ? null, kernel}: +{ stdenv, fetchurl, perl, cross ? null }: assert cross == null -> stdenv.isLinux; let - version = kernel.version; + version = "2.6.35.14"; kernelHeadersBaseConfig = if (cross == null) then stdenv.platform.kernelHeadersBaseConfig else @@ -13,7 +13,10 @@ in stdenv.mkDerivation { 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae9b3022d2a..d33b82f24de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5330,16 +5330,7 @@ let libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { }; - linuxHeaders = - let - - kernel = { - src = linuxPackages.kernel.src; - version = linuxPackages.kernel.version; - }; - - in - callPackage ../os-specific/linux/kernel-headers { inherit kernel; }; + linuxHeaders = callPackage ../os-specific/linux/kernel-headers { }; linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { inherit stdenv fetchurl perl; @@ -5359,12 +5350,8 @@ let linuxHeadersCross = assert crossSystem != null; 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_32 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { }; - kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) {