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

* Linux updated to 2.6.20.11.

Browse Source 
* Build the kernel with the new gcc wrapper so that LINUX_COMPILER
  gets set properly (and in particular so that the kernel version
  string doesn't show "(collect2: ld returned 1 exit status)").

svn path=/nixpkgs/trunk/; revision=8645
This commit is contained in:
Eelco Dolstra 2007-05-02 15:21:55 +00:00
parent 0a05618f11
commit 34b59c1867
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-2.6.20.nix
View File

@ -16,7 +16,7 @@ let
lib = import ../../../lib; lib = import ../../../lib;
version = "2.6.20.7"; version = "2.6.20.11";
in in
@ -26,7 +26,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2"; url = "http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1a6flnnaaj11c7cgsr63ix5ln67wih3ffbv473dvsqb0c2rmwvw5"; sha256 = "1n0xgqckj64ga3l53l8lk1591lfcn6zcrqg3phz2m0y841ck5qlk";
}; };
patches = map (p: p.patch) kernelPatches; patches = map (p: p.patch) kernelPatches;

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

@ -2228,7 +2228,8 @@ rec {
kernel = kernel_2_6_20; kernel = kernel_2_6_20;
kernel_2_6_20 = import ../os-specific/linux/kernel/linux-2.6.20.nix { kernel_2_6_20 = import ../os-specific/linux/kernel/linux-2.6.20.nix {
inherit fetchurl stdenv perl mktemp module_init_tools; inherit fetchurl perl mktemp module_init_tools;
stdenv = overrideGCC stdenv gccNew;
kernelPatches = [ kernelPatches = [
{ name = "skas-2.6.20-v9-pre9"; { name = "skas-2.6.20-v9-pre9";
patch = fetchurl { patch = fetchurl {