diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/aufs2-33.patch | 82 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 99 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/aufs2-33.patch b/pkgs/os-specific/linux/kernel/aufs2-33.patch new file mode 100644 index 00000000000..49a660b0c9e --- /dev/null +++ b/pkgs/os-specific/linux/kernel/aufs2-33.patch @@ -0,0 +1,82 @@ +ufs2 base patch for linux-2.6.33 + +diff --git a/fs/namei.c b/fs/namei.c +index a4855af..1d12d37 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1207,7 +1207,7 @@ out: + * needs parent already locked. Doesn't follow mounts. + * SMP-safe. + */ +-static struct dentry *lookup_hash(struct nameidata *nd) ++struct dentry *lookup_hash(struct nameidata *nd) + { + int err; + +@@ -1217,7 +1217,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } + +-static int __lookup_one_len(const char *name, struct qstr *this, ++int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) + { + unsigned long hash; +diff --git a/fs/splice.c b/fs/splice.c +index 3920866..b13a9a2 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1053,8 +1053,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); + /* + * Attempt to initiate a splice from pipe to file. + */ +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +- loff_t *ppos, size_t len, unsigned int flags) ++long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags) + { + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, + loff_t *, size_t, unsigned int); +@@ -1081,9 +1081,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + /* + * Attempt to initiate a splice from a file to a pipe. + */ +-static long do_splice_to(struct file *in, loff_t *ppos, +- struct pipe_inode_info *pipe, size_t len, +- unsigned int flags) ++long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) + { + ssize_t (*splice_read)(struct file *, loff_t *, + struct pipe_inode_info *, size_t, unsigned int); +diff --git a/include/linux/namei.h b/include/linux/namei.h +index 05b441d..91bc74e 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, + extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, + int (*open)(struct inode *, struct file *)); + ++extern struct dentry *lookup_hash(struct nameidata *nd); ++extern int __lookup_one_len(const char *name, struct qstr *this, ++ struct dentry *base, int len); + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); + + extern int follow_down(struct path *); +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 18e7c7c..8393b5c 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, + extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, + splice_direct_actor *); + ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags); ++extern long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); ++ + #endif + diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 70016e72910..2b0d76d76ed 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -195,6 +195,15 @@ rec { features.aufsBase = true; }; + aufs2_2_6_33 = + { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-33;hb=aufs2-33 + # Note that this merely the patch needed to build AUFS2 as a + # standalone package. + name = "aufs2"; + patch = ./aufs2-33.patch; + features.aufsBase = true; + }; + aufs2_2_6_34 = { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-34;hb=aufs2-34 # Note that this merely the patch needed to build AUFS2 as a diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5bd20c39e2..085543c788f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5297,6 +5297,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_31 kernelPatches.sec_perm_2_6_24 + kernelPatches.aufs2_2_6_32 kernelPatches.tracehook_2_6_32 kernelPatches.utrace_2_6_32 ]; @@ -5322,6 +5323,7 @@ let inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = [ kernelPatches.fbcondecor_2_6_33 + kernelPatches.aufs2_2_6_33 kernelPatches.sec_perm_2_6_24 kernelPatches.cifs_timeout_2_6_29 ]; @@ -5379,11 +5381,17 @@ let linux_nanonote_jz_2_6_34 = makeOverridable (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix) { inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser; + kernelPatches = + [ kernelPatches.aufs2_2_6_34 + ]; }; linux_nanonote_jz_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.35.nix) { inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser; + kernelPatches = + [ kernelPatches.aufs2_2_6_35 + ]; }; linux_nanonote_jz_2_6_36 = makeOverridable |