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

* Kernel patches should declare their .config options so that we don't

Browse Source 
have to keep them in config-blahblah.

svn path=/nixpkgs/trunk/; revision=7747
This commit is contained in:
Eelco Dolstra
2007-01-22 15:18:30 +00:00
parent e67a0ca213
commit e8de94e114
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/builder.sh
+3
View File
@@ -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
pkgs/os-specific/linux/kernel/config-2.6.19.2-i686-smp
+1 -2
View File
@@ -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
pkgs/os-specific/linux/kernel/config-2.6.19.2-x86_64-smp
-1
View File
@@ -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
pkgs/os-specific/linux/kernel/linux-2.6.19.nix
+4 -2
View File
@@ -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))
+ ")");
};
}