* Linux 2.6.25.4.

* Updated AUFS for 2.6.25.  Also applied a patch to the kernel that
  AUFS needs, unfortunately.

svn path=/nixpkgs/trunk/; revision=11864
This commit is contained in:
Eelco Dolstra
2008-05-21 09:19:44 +00:00
parent 32bf11a247
commit ae972ce4d3
4 changed files with 32 additions and 7 deletions

View File

@@ -28,7 +28,7 @@ let
lib = import ../../../lib;
version = "2.6.25.2";
version = "2.6.25.4";
in
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "11in4wm88syyrmnm9jv8w977hgw9n8zl8qvaz6zkq8qbyxh4frqi";
sha256 = "0hp36pwphw5rs9kwm5ksr7ynfmzgpcd8gi45rigbilvcvmsdnxf3";
};
patches = map (p: p.patch) kernelPatches;

View File

@@ -0,0 +1,16 @@
Index: linux-2.6.24-rc3/security/security.c
===================================================================
RCS file: /ext1/sysadm/transparent/repository/linux-2.6.24-rc3/security/security.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6.24-rc3/security/security.c 21 Nov 2007 13:03:11 -0000 1.1
+++ linux-2.6.24-rc3/security/security.c 21 Nov 2007 13:07:55 -0000 1.2
@@ -409,6 +409,7 @@ int security_inode_permission(struct ino
return 0;
return security_ops->inode_permission(inode, mask, nd);
}
+EXPORT_SYMBOL(security_inode_permission);
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{