diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-18 22:09:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-18 22:09:47 +0000 |
| commit | f772de22a156dafdf37c0bdf0c1bc52436e1a997 (patch) | |
| tree | 73c52389d15a9398edb52cf7e6f9555133e2e0df /pkgs/os-specific | |
| parent | 5bfc14d14ca0a722f420b088fabc6f257ef150f1 (diff) | |
* Updated the kernel to 2.6.17.13.
* Run `make oldconfig' before building. * Split buildPhase into configure/build/installPhase. * Strip the kernel modules for a huge space savings. svn path=/nixpkgs/trunk/; revision=6555
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/builder.sh | 29 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.17.nix | 6 |
2 files changed, 28 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 8b5b672947054..0a6b3c1dd2f0c 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -1,21 +1,43 @@ source $stdenv/setup -buildPhase() { + +configurePhase=configurePhase +configurePhase() { cp $config .config #mkdir $out hashname=$(basename $out) - echo $hashname if echo "$hashname" | grep -q '^[a-z0-9]\{32\}-'; then hashname=$(echo "$hashname" | cut -c -32) fi extraname=$(grep ^EXTRAVERSION Makefile) perl -p -i -e "s/^EXTRAVERSION.*/$extraname-$hashname/" Makefile - echo "export INSTALL_PATH=$out" >> Makefile + export INSTALL_PATH=$out export INSTALL_MOD_PATH=$out + + make oldconfig +} + + +buildPhase=buildPhase +buildPhase() { make +} + + +installPhase=installPhase +installPhase() { + + ensureDir $out + + make install + make modules_install + # Strip the kernel modules. + echo "Stripping kernel modules..." + find $out -name "*.ko" -print0 | xargs -0 strip -S + # move this to install later on # largely copied from early FC3 kernel spec files stripHash $out @@ -65,6 +87,5 @@ buildPhase() { } -buildPhase=buildPhase genericBuild diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.17.nix b/pkgs/os-specific/linux/kernel/linux-2.6.17.nix index 0afe5b67119d3..a89399a5578e1 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.17.nix @@ -3,11 +3,11 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "linux-2.6.17.6"; + name = "linux-2.6.17.13"; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.6.tar.bz2; - md5 = "5013fbe6049e32675187c203aef92218"; + url = http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.13.tar.bz2; + md5 = "834885b3ad9988b966570bee92459572"; }; config = ./config-2.6.17.1; inherit perl; |