mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 13:08:39 +03:00
* 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
This commit is contained in:
parent
e67a0ca213
commit
e8de94e114
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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))
|
||||
+ ")");
|
||||
};
|
||||
}
|
||||
|
@ -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";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user