From 6eaaa060771b21a0e260d52185a8cc6759409bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 30 Mar 2011 08:16:44 +0000 Subject: [PATCH] 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 --- pkgs/os-specific/linux/kernel/patches.nix | 1 + pkgs/top-level/all-packages.nix | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3811ce324d6..fafb38cae0b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -209,6 +209,7 @@ in 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5096c50e77..654a735bbc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5117,12 +5117,16 @@ let 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_1_util = callPackage ../os-specific/linux/aufs2.1-util { }; - blcr = callPackage ../os-specific/linux/blcr { #libtool = libtool_1_5; # libtool 2 causes a fork bomb };