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

* Remove the systemtap option from linux-2.6.32.nix and use

Browse Source 
extraConfig instead.

svn path=/nixpkgs/trunk/; revision=23720
This commit is contained in:
Eelco Dolstra 2010-09-10 14:06:56 +00:00
parent 193799ec3d
commit 9ff5c12798
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/os-specific/linux/kernel/linux-2.6.32.nix
View File

@ -1,11 +1,10 @@
{ stdenv, fetchurl, userModeLinux ? false, systemtap ? false { stdenv, fetchurl, extraConfig ? "", ... } @ args:
, extraConfig ? "", ... } @ args:
let let
configWithPlatform = kernelPlatform: configWithPlatform = kernelPlatform:
'' ''
# Don't include any debug features. # Don't include any debug features.
DEBUG_KERNEL ${if systemtap then "y" else "n"} DEBUG_KERNEL n
# Support drivers that need external firmware. # Support drivers that need external firmware.
STANDALONE n STANDALONE n
@ -25,6 +24,7 @@ let
# Disable some expensive (?) features. # Disable some expensive (?) features.
FTRACE n FTRACE n
KPROBES n
NUMA? n NUMA? n
PM_TRACE_RTC n PM_TRACE_RTC n
@ -190,14 +190,6 @@ let
X86_CHECK_BIOS_CORRUPTION y X86_CHECK_BIOS_CORRUPTION y
X86_MCE y X86_MCE y
${if systemtap then ''
# SystemTap support.
KPROBES y # kernel probes (needs `utrace' for process probes)
DEBUG_INFO y
RELAY y
DEBUG_FS y
'' else ""}
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig} ${extraConfig}
''; '';

9
pkgs/top-level/all-packages.nix
View File

@ -4473,7 +4473,14 @@ let
linux_2_6_32_systemtap = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) { linux_2_6_32_systemtap = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
systemtap = true; extraConfig =
''
DEBUG_KERNEL y
KPROBES y # kernel probes (needs `utrace' for process probes)
DEBUG_INFO y
RELAY y
DEBUG_FS y
'';
dontStrip = true; dontStrip = true;
kernelPatches = kernelPatches =
[ kernelPatches.fbcondecor_2_6_31 [ kernelPatches.fbcondecor_2_6_31