diff options
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/bbswitch/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/frandom/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.39.nix | 16 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.0.nix | 16 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.1.nix | 16 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.2.nix | 22 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 14 |
7 files changed, 81 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 502d24d32d8b5..a8f8a9d33ef3b 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, kernel }: let - - version = "0.4.1"; - name = "bbswitch-${version}-${kernel.version}"; + baseName = "bbswitch-0.4.1"; + name = "${baseName}-${kernel.version}"; in @@ -11,7 +10,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${name}.tar.gz"; + url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${baseName}.tar.gz"; sha256 = "d579c6efc5f6482f0cf0b2c1b1f1a127413218cdffdc8f2d5a946c11909bda23"; }; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index fb2c50a778d51..7894e86ded980 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -1,10 +1,13 @@ { stdenv, fetchurl, kernel }: +let baseName = "frandom-1.1"; +in + stdenv.mkDerivation rec { - name = "frandom-1.1-${kernel.version}"; + name = "${baseName}-${kernel.version}"; src = fetchurl { - url = "http://sourceforge.net/projects/frandom/files/${name}.tar.gz"; + url = "http://sourceforge.net/projects/frandom/files/${baseName}.tar.gz"; sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix index 44a82e0836d16..64aa288c8c8e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 557223e626048..95b3ef16699df 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index f1f1aa7f8fc7d..2e48eb3e4602a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index b77f6eb47885c..66643a3117efc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n @@ -214,7 +226,7 @@ in import ./generic.nix ( rec { - version = "3.2.4"; + version = "3.2.7"; testing = false; modDirVersion = version; @@ -222,10 +234,10 @@ import ./generic.nix ( preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; - + src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2"; - sha256 = "1c648a7041e65a167d3fd8beda484a3d55c35cad9d6d189b9949d3c621887da7"; + sha256 = "e80009e097e137b9a1f1efacabc482c1d4b3651b238bf733a41595d0b387ae12"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fd5a27e0eace9..42c99f0d56cde 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -252,6 +252,20 @@ rec { features.aufs3 = true; }; + aufs3_2 = rec { + name = "aufs3.2"; + version = "3.2"; + utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f"; + utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033"; + sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea"; + }; + features.aufsBase = true; + features.aufs3 = true; + }; + # Increase the timeout on CIFS requests from 15 to 120 seconds to # make CIFS more resilient to high load on the CIFS server. cifs_timeout_2_6_15 = |