diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-10-31 14:01:22 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-10-31 14:01:22 +0000 |
commit | 50516a2356d52c7bdabbf181daaf4831a1b170a8 (patch) | |
tree | f4b5b0d57ca96d98097baf411610b5a8b010b029 /sys-fs/aufs3 | |
parent | Mask >=udev-167 since it uses accept4(), which is not implemented on alpha yet (diff) | |
download | gentoo-2-50516a2356d52c7bdabbf181daaf4831a1b170a8.tar.gz gentoo-2-50516a2356d52c7bdabbf181daaf4831a1b170a8.tar.bz2 gentoo-2-50516a2356d52c7bdabbf181daaf4831a1b170a8.zip |
Version Bump
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/aufs3')
-rw-r--r-- | sys-fs/aufs3/ChangeLog | 9 | ||||
-rw-r--r-- | sys-fs/aufs3/aufs3-3_p20111031.ebuild | 129 | ||||
-rw-r--r-- | sys-fs/aufs3/files/aufs-util-31.patch | 35 | ||||
-rw-r--r-- | sys-fs/aufs3/files/aufs3-base-1.patch | 70 | ||||
-rw-r--r-- | sys-fs/aufs3/files/aufs3-standalone-0.patch | 4 | ||||
-rw-r--r-- | sys-fs/aufs3/files/aufs3-standalone-1.patch | 249 |
6 files changed, 493 insertions, 3 deletions
diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog index 65393413cf42..730105814f4e 100644 --- a/sys-fs/aufs3/ChangeLog +++ b/sys-fs/aufs3/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/aufs3 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.1 2011/08/28 09:48:57 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.2 2011/10/31 14:01:22 jlec Exp $ + +*aufs3-3_p20111031 (31 Oct 2011) + + 31 Oct 2011; Justin Lecher <jlec@gentoo.org> files/aufs3-standalone-0.patch, + +files/aufs3-base-1.patch, +files/aufs3-standalone-1.patch, + +aufs3-3_p20111031.ebuild, +files/aufs-util-31.patch: + Version Bump 28 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/aufs3-base-0.patch, +files/aufs3-standalone-0.patch, +aufs3-3_p20110815.ebuild, +files/pax.patch, diff --git a/sys-fs/aufs3/aufs3-3_p20111031.ebuild b/sys-fs/aufs3/aufs3-3_p20111031.ebuild new file mode 100644 index 000000000000..22e166ff6328 --- /dev/null +++ b/sys-fs/aufs3/aufs3-3_p20111031.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20111031.ebuild,v 1.1 2011/10/31 14:01:21 jlec Exp $ + +EAPI=4 + +inherit linux-mod multilib toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +#PATCH_VER=x-rcN + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs" + +DEPEND="dev-vcs/git" +RDEPEND=" + !sys-fs/aufs + !sys-fs/aufs2" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL" + use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" + use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS" + use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" + use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" + + # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2" + kernel_is gt 3 1 99 && die "kernel too new" + + linux-mod_pkg_setup + + [[ -n ${PATCH_VER} ]] || PATCH_VER=${KV_MINOR} + + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null && \ + patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null ); then + if use kernel-patch; then + cd ${KV_DIR} + ewarn "Patching your kernel..." + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null + epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_VER}.patch + ewarn "You need to compile your kernel with the applied patch" + ewarn "to be able to load and use the aufs kernel module" + else + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_VER}.patch and" + eerror "${FILESDIR}/${PN}-standalone-${PATCH_VER}.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + export PKG_SETUP_HAS_BEEN_RAN=1 +} + +set_config() { + for option in $*; do + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die + done +} + +src_prepare() { + local branch=origin/${PN}.${PATCH_VER} + + git checkout -q -b local-gentoo $branch || die + + # All config options to off + sed "s:= y:=:g" -i config.mk || die + + set_config RDU BRANCH_MAX_127 SBILIST + + use debug && set_config DEBUG + use fuse && set_config BR_FUSE POLL + use hfs && set_config BR_HFSPLUS + use inotify && set_config HNOTIFY HFSNOTIFY + use nfs && set_config EXPORT + use nfs && use amd64 && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + use pax_kernel && epatch "${FILESDIR}"/pax.patch + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die + sed -i "s:__user::g" include/linux/aufs_type.h || die + + cd "${WORKDIR}"/${PN/3}-util + PATCH_VER=0 + git checkout -b local-gentoo origin/${PN}.${PATCH_VER} + epatch "${FILESDIR}"/aufs-util-31.patch + sed -i "/LDFLAGS += -static -s/d" Makefile || die + sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} + + cd "${WORKDIR}"/${PN/3}-util + emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include +} + +src_install() { + linux-mod_src_install + + insinto /usr/share/doc/${PF} + + use doc && doins -r Documentation + + dodoc README + + cd "${WORKDIR}"/${PN/3}-util + emake DESTDIR="${D}" KDIR=${KV_DIR} install + + newdoc README README-utils +} diff --git a/sys-fs/aufs3/files/aufs-util-31.patch b/sys-fs/aufs3/files/aufs-util-31.patch new file mode 100644 index 000000000000..e5ae0a6fe3bb --- /dev/null +++ b/sys-fs/aufs3/files/aufs-util-31.patch @@ -0,0 +1,35 @@ +diff --git a/ver.c b/ver.c +index 1225bf6..921005f 100644 +--- a/ver.c ++++ b/ver.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2010 Junjiro R. Okajima ++ * Copyright (C) 2011 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -17,15 +17,20 @@ + */ + + #include <linux/aufs_type.h> ++#include <regex.h> + #include <stdio.h> + #include <string.h> + #include "au_util.h" + + int main(int argc, char *argv[]) + { +- if (!strncmp(AUFS_VERSION, "3.0", 3) +- && (sizeof(AUFS_VERSION) - 1 == 3 +- || AUFS_VERSION[3] == '-')) ++ regex_t preg; ++ const char *pat = "^3\\.[01](-|$)"; ++ ++ if (regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB)) ++ AuFin("regcomp"); ++ ++ if (!regexec(&preg, AUFS_VERSION, 0, NULL, 0)) + return 0; + + puts("Wrong version!\n" diff --git a/sys-fs/aufs3/files/aufs3-base-1.patch b/sys-fs/aufs3/files/aufs3-base-1.patch new file mode 100644 index 000000000000..928c3cec768c --- /dev/null +++ b/sys-fs/aufs3/files/aufs3-base-1.patch @@ -0,0 +1,70 @@ +aufs3.1 base patch + +diff --git a/fs/namei.c b/fs/namei.c +index 0b3138d..8edad02 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1748,7 +1748,7 @@ static struct dentry *__lookup_hash(struct qstr *name, + * 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) + { + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } +diff --git a/fs/splice.c b/fs/splice.c +index fa2defa..e3569b0 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1085,8 +1085,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); +@@ -1113,9 +1113,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 409328d..40afdc0 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -84,6 +84,7 @@ 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 struct dentry *lookup_one_len(const char *, struct dentry *, int); + + extern int follow_down_one(struct path *); +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 26e5b61..3ffef2f 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, + extern void spd_release_page(struct splice_pipe_desc *, unsigned int); + + extern const struct pipe_buf_operations page_cache_pipe_buf_ops; ++ ++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/sys-fs/aufs3/files/aufs3-standalone-0.patch b/sys-fs/aufs3/files/aufs3-standalone-0.patch index 1c406c07e9b7..54456bf3b030 100644 --- a/sys-fs/aufs3/files/aufs3-standalone-0.patch +++ b/sys-fs/aufs3/files/aufs3-standalone-0.patch @@ -151,10 +151,10 @@ index 19afec6..11f07f8 100644 /** * splice_direct_to_actor - splices data directly between two non-pipes diff --git a/security/commoncap.c b/security/commoncap.c -index f20e984..d39acd9 100644 +index a93b3b7..024282c 100644 --- a/security/commoncap.c +++ b/security/commoncap.c -@@ -976,3 +976,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, +@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, } return ret; } diff --git a/sys-fs/aufs3/files/aufs3-standalone-1.patch b/sys-fs/aufs3/files/aufs3-standalone-1.patch new file mode 100644 index 000000000000..72f3ae9e432b --- /dev/null +++ b/sys-fs/aufs3/files/aufs3-standalone-1.patch @@ -0,0 +1,249 @@ +aufs3.1 standalone patch + +diff --git a/fs/file_table.c b/fs/file_table.c +index c322794..2aad244 100644 +--- a/fs/file_table.c ++++ b/fs/file_table.c +@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) + } + } + ++EXPORT_SYMBOL(file_sb_list_del); ++ + #ifdef CONFIG_SMP + + /* +diff --git a/fs/inode.c b/fs/inode.c +index ec79246..46ac6f9 100644 +--- a/fs/inode.c ++++ b/fs/inode.c +@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly; + static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); + + __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); ++EXPORT_SYMBOL(inode_sb_list_lock); + + /* + * Empty aops. Can be used for the cases where the user does not +diff --git a/fs/namei.c b/fs/namei.c +index 8edad02..50e8718 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1752,6 +1752,7 @@ struct dentry *lookup_hash(struct nameidata *nd) + { + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } ++EXPORT_SYMBOL(lookup_hash); + + /** + * lookup_one_len - filesystem helper to lookup single pathname component +diff --git a/fs/namespace.c b/fs/namespace.c +index b4febb2..598a308 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, + } + return 0; + } ++EXPORT_SYMBOL(iterate_mounts); + + static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) + { +diff --git a/fs/notify/group.c b/fs/notify/group.c +index 63fc294..6f4adca 100644 +--- a/fs/notify/group.c ++++ b/fs/notify/group.c +@@ -22,6 +22,7 @@ + #include <linux/srcu.h> + #include <linux/rculist.h> + #include <linux/wait.h> ++#include <linux/module.h> + + #include <linux/fsnotify_backend.h> + #include "fsnotify.h" +@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + if (atomic_dec_and_test(&group->refcnt)) + fsnotify_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_put_group); + + /* + * Create a new fsnotify_group and hold a reference for the group returned. +@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) + + return group; + } ++EXPORT_SYMBOL(fsnotify_alloc_group); +diff --git a/fs/notify/mark.c b/fs/notify/mark.c +index e14587d..be6533b 100644 +--- a/fs/notify/mark.c ++++ b/fs/notify/mark.c +@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) + if (atomic_dec_and_test(&mark->refcnt)) + mark->free_mark(mark); + } ++EXPORT_SYMBOL(fsnotify_put_mark); + + /* + * Any time a mark is getting freed we end up here. +@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) + if (unlikely(atomic_dec_and_test(&group->num_marks))) + fsnotify_final_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_destroy_mark); + + void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) + { +@@ -276,6 +278,7 @@ err: + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /* + * clear any marks in a group in which mark->flags & flags is true +@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, + atomic_set(&mark->refcnt, 1); + mark->free_mark = free_mark; + } ++EXPORT_SYMBOL(fsnotify_init_mark); + + static int fsnotify_mark_destroy(void *ignored) + { +diff --git a/fs/open.c b/fs/open.c +index f711921..d742fc0 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, + mutex_unlock(&dentry->d_inode->i_mutex); + return ret; + } ++EXPORT_SYMBOL(do_truncate); + + static long do_sys_truncate(const char __user *pathname, loff_t length) + { +diff --git a/fs/splice.c b/fs/splice.c +index e3569b0..9dc07b7 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + + return splice_write(pipe, out, ppos, len, flags); + } ++EXPORT_SYMBOL(do_splice_from); + + /* + * Attempt to initiate a splice from a file to a pipe. +@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, + + return splice_read(in, ppos, pipe, len, flags); + } ++EXPORT_SYMBOL(do_splice_to); + + /** + * splice_direct_to_actor - splices data directly between two non-pipes +diff --git a/security/commoncap.c b/security/commoncap.c +index a93b3b7..024282c 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, + } + return ret; + } ++EXPORT_SYMBOL(cap_file_mmap); +diff --git a/security/device_cgroup.c b/security/device_cgroup.c +index 4450fbe..2c437e5 100644 +--- a/security/device_cgroup.c ++++ b/security/device_cgroup.c +@@ -500,6 +500,7 @@ found: + + return -EPERM; + } ++EXPORT_SYMBOL(__devcgroup_inode_permission); + + int devcgroup_inode_mknod(int mode, dev_t dev) + { +diff --git a/security/security.c b/security/security.c +index d9e1533..466ee5c 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) + return 0; + return security_ops->path_rmdir(dir, dentry); + } ++EXPORT_SYMBOL(security_path_rmdir); + + int security_path_unlink(struct path *dir, struct dentry *dentry) + { +@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, + return 0; + return security_ops->path_symlink(dir, dentry, old_name); + } ++EXPORT_SYMBOL(security_path_symlink); + + int security_path_link(struct dentry *old_dentry, struct path *new_dir, + struct dentry *new_dentry) +@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, + return 0; + return security_ops->path_link(old_dentry, new_dir, new_dentry); + } ++EXPORT_SYMBOL(security_path_link); + + int security_path_rename(struct path *old_dir, struct dentry *old_dentry, + struct path *new_dir, struct dentry *new_dentry) +@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path) + return 0; + return security_ops->path_truncate(path); + } ++EXPORT_SYMBOL(security_path_truncate); + + int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + mode_t mode) +@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + return 0; + return security_ops->path_chmod(dentry, mnt, mode); + } ++EXPORT_SYMBOL(security_path_chmod); + + int security_path_chown(struct path *path, uid_t uid, gid_t gid) + { +@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) + return 0; + return security_ops->path_chown(path, uid, gid); + } ++EXPORT_SYMBOL(security_path_chown); + + int security_path_chroot(struct path *path) + { +@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) + return 0; + return security_ops->inode_readlink(dentry); + } ++EXPORT_SYMBOL(security_inode_readlink); + + int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) + { +@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) + return 0; + return security_ops->inode_permission(inode, mask); + } ++EXPORT_SYMBOL(security_inode_permission); + + int security_inode_setattr(struct dentry *dentry, struct iattr *attr) + { +@@ -619,6 +627,7 @@ int security_file_permission(struct file *file, int mask) + + return fsnotify_perm(file, mask); + } ++EXPORT_SYMBOL(security_file_permission); + + int security_file_alloc(struct file *file) + { +@@ -646,6 +655,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, + return ret; + return ima_file_mmap(file, prot); + } ++EXPORT_SYMBOL(security_file_mmap); + + int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, + unsigned long prot) |