Author: eelco
Date: Fri Sep 10 14:06:56 2010
New Revision: 23720
URL: https://svn.nixos.org/websvn/nix/?rev=23720&sc=1
Log:
* Remove the systemtap option from linux-2.6.32.nix and use
extraConfig instead.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix Fri Sep
10 12:42:37 2010 (r23719)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix Fri Sep
10 14:06:56 2010 (r23720)
@@ -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 @@
# Disable some expensive (?) features.
FTRACE n
+ KPROBES n
NUMA? n
PM_TRACE_RTC n
@@ -190,14 +190,6 @@
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}
'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 10 12:42:37
2010 (r23719)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 10 14:06:56
2010 (r23720)
@@ -4473,7 +4473,14 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
