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

* Re-enable the fbcondecor patch for Linux 2.6.35, seems to work fine.

Browse Source 
svn path=/nixpkgs/trunk/; revision=28974
This commit is contained in:
Eelco Dolstra 2011-09-02 13:41:38 +00:00
parent c084ef2f61
commit e8c849f8e3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/kernel/linux-2.6.35.nix
View File

@ -1,8 +1,7 @@
args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" { stdenv, fetchurl, extraConfig ? "", ... } @ args:
, ... }:
let let
configWithPlatform = kernelPlatform : configWithPlatform = kernelPlatform:
'' ''
# Don't include any debug features. # Don't include any debug features.
DEBUG_KERNEL n DEBUG_KERNEL n

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

@ -5392,7 +5392,7 @@ let
linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches = kernelPatches =
[ #kernelPatches.fbcondecor_2_6_35 [ kernelPatches.fbcondecor_2_6_35
kernelPatches.sec_perm_2_6_24 kernelPatches.sec_perm_2_6_24
kernelPatches.aufs2_2_6_35 kernelPatches.aufs2_2_6_35
kernelPatches.cifs_timeout_2_6_35 kernelPatches.cifs_timeout_2_6_35
@ -5659,7 +5659,7 @@ let
linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
# The current default kernel / kernel modules. # The current default kernel / kernel modules.
linux = linux_2_6_32; linux = linuxPackages.kernel;
linuxPackages = linuxPackages_2_6_32; linuxPackages = linuxPackages_2_6_32;
keyutils = callPackage ../os-specific/linux/keyutils { }; keyutils = callPackage ../os-specific/linux/keyutils { };