diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-01-22 15:18:30 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-01-22 15:18:30 +0000 |
| commit | e8de94e114a5e212e9f8192373d454a9fdd7ec82 (patch) | |
| tree | e9b567b6fe5a3ff18f7af3e0ea17c09052a3f85d /pkgs/os-specific/linux | |
| parent | e67a0ca2130219a3f61f8ae2224b08fb2cfcd688 (diff) | |
| download | nixlib-e8de94e114a5e212e9f8192373d454a9fdd7ec82.tar nixlib-e8de94e114a5e212e9f8192373d454a9fdd7ec82.tar.gz nixlib-e8de94e114a5e212e9f8192373d454a9fdd7ec82.tar.bz2 nixlib-e8de94e114a5e212e9f8192373d454a9fdd7ec82.tar.lz nixlib-e8de94e114a5e212e9f8192373d454a9fdd7ec82.tar.xz nixlib-e8de94e114a5e212e9f8192373d454a9fdd7ec82.tar.zst nixlib-e8de94e114a5e212e9f8192373d454a9fdd7ec82.zip | |
* Kernel patches should declare their .config options so that we don't
have to keep them in config-blahblah. svn path=/nixpkgs/trunk/; revision=7747
Diffstat (limited to 'pkgs/os-specific/linux')
4 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index fabee199a4ff..e051fd0911ff 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -7,6 +7,9 @@ configurePhase() { export INSTALL_MOD_PATH=$out cp $config .config + chmod u+w .config + + echo "$extraConfig" >> .config #substituteInPlace scripts/kconfig/lxdialog/check-lxdialog.sh \ # --replace /usr /no-such-path diff --git a/pkgs/os-specific/linux/kernel/config-2.6.19.2-i686-smp b/pkgs/os-specific/linux/kernel/config-2.6.19.2-i686-smp index c2ef369198dc..4c8523d2e1e6 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.19.2-i686-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.19.2-i686-smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.19.2 -# Mon Jan 22 12:03:13 2007 +# Mon Jan 22 14:44:00 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -2776,7 +2776,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y -CONFIG_FB_SPLASH=y # # Sound diff --git a/pkgs/os-specific/linux/kernel/config-2.6.19.2-x86_64-smp b/pkgs/os-specific/linux/kernel/config-2.6.19.2-x86_64-smp index 534ac167764b..90ac28ef1b24 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.19.2-x86_64-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.19.2-x86_64-smp @@ -2506,7 +2506,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y -CONFIG_FB_SPLASH=y # # Sound diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.19.nix b/pkgs/os-specific/linux/kernel/linux-2.6.19.nix index ff8aa40db91f..c665c8ee31d2 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.19.nix @@ -9,6 +9,8 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +let lib = import ../../../lib; in + stdenv.mkDerivation { name = "linux-2.6.19.2"; builder = ./builder.sh; @@ -19,6 +21,7 @@ stdenv.mkDerivation { }; patches = map (p: p.patch) kernelPatches; + extraConfig = lib.concatStrings (map (p: "\n" + p.extraConfig + "\n") kernelPatches); config = if stdenv.system == "i686-linux" then ./config-2.6.19.2-i686-smp else @@ -39,8 +42,7 @@ stdenv.mkDerivation { "The Linux kernel" + (if kernelPatches == [] then "" else " (with patches: " - + (let lib = import ../../../lib; - in lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))) + + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); }; } |