Author: viric
Date: Wed Mar 30 08:16:44 2011
New Revision: 26597
URL: https://svn.nixos.org/websvn/nix/?rev=26597&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Tue Mar 29
20:47:55 2011 (r26596)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Wed Mar 30
08:16:44 2011 (r26597)
@@ -209,6 +209,7 @@
name = "aufs2.1";
patch = ./aufs2.1-37.patch;
features.aufsBase = true;
+ features.aufs2_1 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 29 20:47:55
2011 (r26596)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 30 08:16:44
2011 (r26597)
@@ -5117,11 +5117,15 @@
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_util = callPackage ../os-specific/linux/aufs2-util { };
+ aufs2_1_util = if kernel.features ? aufs2_1 then
+ callPackage ../os-specific/linux/aufs2.1-util { }
+ else null;
- aufs2_1_util = callPackage ../os-specific/linux/aufs2.1-util { };
+ aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
blcr = callPackage ../os-specific/linux/blcr {
#libtool = libtool_1_5; # libtool 2 causes a fork bomb
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
