diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index fabee199a4f..e051fd0911f 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 c2ef369198d..4c8523d2e1e 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 534ac167764..90ac28ef1b2 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 ff8aa40db91..c665c8ee31d 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)) + ")"); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04822873140..9233f80ff68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2200,12 +2200,16 @@ rec { url = http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.19-rc6-v9-pre9/skas-2.6.19-rc6-v9-pre9.patch.bz2; md5 = "262368b6cf29026be44bebfff2e57aed"; }; + extraConfig = + "CONFIG_PROC_MM=y\n" + + "# CONFIG_PROC_MM_DUMPABLE is not set\n"; } { name = "fbsplash-0.9.2-r5-2.6.19-rc2"; patch = fetchurl { url = http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.19-rc2.patch; md5 = "1f58715f3c5f85bb8b6e14c35b2f4463"; }; + extraConfig = "CONFIG_FB_SPLASH=y"; } ]; };