summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/patches.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2011-03-30 08:16:44 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2011-03-30 08:16:44 +0000
commit6eaaa060771b21a0e260d52185a8cc6759409bee (patch)
tree8be00a4d95d3b6337a84d3e4898d95734e64c9e9 /pkgs/os-specific/linux/kernel/patches.nix
parentfc46d920324f8d45b103aed2320fb5688258cd27 (diff)
downloadnixpkgs-6eaaa060771b21a0e260d52185a8cc6759409bee.tar
nixpkgs-6eaaa060771b21a0e260d52185a8cc6759409bee.tar.gz
nixpkgs-6eaaa060771b21a0e260d52185a8cc6759409bee.tar.bz2
nixpkgs-6eaaa060771b21a0e260d52185a8cc6759409bee.tar.lz
nixpkgs-6eaaa060771b21a0e260d52185a8cc6759409bee.tar.xz
nixpkgs-6eaaa060771b21a0e260d52185a8cc6759409bee.tar.zst
nixpkgs-6eaaa060771b21a0e260d52185a8cc6759409bee.zip
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
Diffstat (limited to 'pkgs/os-specific/linux/kernel/patches.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix1
1 files changed, 1 insertions, 0 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