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

Committing on behalf of Shea Levy: 

This patch adds a "features.aufs2_1" to the aufs-2.1 patch for Linux
2.6.37 to prevent aufs2_1 and aufs2_1_util from being options for
kernels without an aufs 2.1 patch. There were several Hydra build
failures as a result of attempting to build aufs2.1 against older
kernels.

svn path=/nixpkgs/trunk/; revision=26597
This commit is contained in:
Lluís Batlle i Rossell 2011-03-30 08:16:44 +00:00
parent fc46d92032
commit 6eaaa06077
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -209,6 +209,7 @@ in
name = "aufs2.1"; name = "aufs2.1";
patch = ./aufs2.1-37.patch; patch = ./aufs2.1-37.patch;
features.aufsBase = true; features.aufsBase = true;
features.aufs2_1 = true;
}; };
# Increase the timeout on CIFS requests from 15 to 120 seconds to # Increase the timeout on CIFS requests from 15 to 120 seconds to

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

@ -5117,12 +5117,16 @@ let
aufs2 = callPackage ../os-specific/linux/aufs2 { }; aufs2 = callPackage ../os-specific/linux/aufs2 { };
aufs2_1 = callPackage ../os-specific/linux/aufs2.1 { }; aufs2_1 = if kernel.features ? aufs2_1 then
callPackage ../os-specific/linux/aufs2.1 { }
else null;
aufs2_1_util = if kernel.features ? aufs2_1 then
callPackage ../os-specific/linux/aufs2.1-util { }
else null;
aufs2_util = callPackage ../os-specific/linux/aufs2-util { }; aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
aufs2_1_util = callPackage ../os-specific/linux/aufs2.1-util { };
blcr = callPackage ../os-specific/linux/blcr { blcr = callPackage ../os-specific/linux/blcr {
#libtool = libtool_1_5; # libtool 2 causes a fork bomb #libtool = libtool_1_5; # libtool 2 causes a fork bomb
}; };