From 9ff5c12798927cf72d3b6e33bf08ca3d8c3b0431 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Sep 2010 14:06:56 +0000 Subject: [PATCH] * Remove the systemtap option from linux-2.6.32.nix and use extraConfig instead. svn path=/nixpkgs/trunk/; revision=23720 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 16 ++++------------ pkgs/top-level/all-packages.nix | 9 ++++++++- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 5ba06e98727..adda4b4be8c 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, userModeLinux ? false, systemtap ? false -, extraConfig ? "", ... } @ args: +{ stdenv, fetchurl, extraConfig ? "", ... } @ args: let - configWithPlatform = kernelPlatform : + configWithPlatform = kernelPlatform: '' # Don't include any debug features. - DEBUG_KERNEL ${if systemtap then "y" else "n"} + DEBUG_KERNEL n # Support drivers that need external firmware. STANDALONE n @@ -25,6 +24,7 @@ let # Disable some expensive (?) features. FTRACE n + KPROBES n NUMA? n PM_TRACE_RTC n @@ -190,14 +190,6 @@ let X86_CHECK_BIOS_CORRUPTION 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 ""} ${extraConfig} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 177e3995fa0..fbfe4a3db36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4473,7 +4473,14 @@ let 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; - 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; kernelPatches = [ kernelPatches.fbcondecor_2_6_31