summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-01-13 07:38:35 +0000
committerJustin Lecher <jlec@gentoo.org>2014-01-13 07:38:35 +0000
commit6d7a229fb80fed728d7d297cd80be4cfb6a384b4 (patch)
tree52a843bbda651f8ff588e6ceeb86b3fac37cf32c /sys-kernel
parentInstallation fix - enables exporters (diff)
downloadgentoo-2-6d7a229fb80fed728d7d297cd80be4cfb6a384b4.tar.gz
gentoo-2-6d7a229fb80fed728d7d297cd80be4cfb6a384b4.tar.bz2
gentoo-2-6d7a229fb80fed728d7d297cd80be4cfb6a384b4.zip
sys-kernel/aufs-sources: Bump to latest aufs3 release
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/aufs-sources/ChangeLog6
-rw-r--r--sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild5
-rw-r--r--sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild5
-rw-r--r--sys-kernel/aufs-sources/files/aufs-sources-3.8.8-CONFIG_USER_NS.patch29
4 files changed, 11 insertions, 34 deletions
diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index 17524283d319..027a50e5ffe7 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/aufs-sources
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.81 2014/01/10 07:20:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.82 2014/01/13 07:38:34 jlec Exp $
+
+ 13 Jan 2014; Justin Lecher <jlec@gentoo.org> aufs-sources-3.10.26.ebuild,
+ aufs-sources-3.12.7.ebuild, -files/aufs-sources-3.8.8-CONFIG_USER_NS.patch:
+ Bump to latest aufs3 release
*aufs-sources-3.10.26 (10 Jan 2014)
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild
index 40b68c266c1e..fcb0ba2df6cf 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild,v 1.1 2014/01/10 07:20:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild,v 1.2 2014/01/13 07:38:34 jlec Exp $
EAPI=5
@@ -8,11 +8,12 @@ ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
K_GENPATCHES_VER="33"
K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
inherit kernel-2 eutils
detect_version
detect_arch
-AUFS_VERSION=3.10_p20131223
+AUFS_VERSION=3.10_p20140114
AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild
index b7e9d3f3c934..90685a77e880 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild,v 1.2 2014/01/10 07:20:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild,v 1.3 2014/01/13 07:38:34 jlec Exp $
EAPI=5
@@ -8,11 +8,12 @@ ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
K_GENPATCHES_VER="8"
K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
inherit kernel-2 eutils
detect_version
detect_arch
-AUFS_VERSION=3.12_p20131223
+AUFS_VERSION=3.12_p20140114
AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/files/aufs-sources-3.8.8-CONFIG_USER_NS.patch b/sys-kernel/aufs-sources/files/aufs-sources-3.8.8-CONFIG_USER_NS.patch
deleted file mode 100644
index 1bedec56abfc..000000000000
--- a/sys-kernel/aufs-sources/files/aufs-sources-3.8.8-CONFIG_USER_NS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 1b7299ead151d838a6ac328e828d6ed520d40a47
-Author: J. R. Okajima <hooanon05@yahoo.co.jp>
-Date: Sun Apr 21 13:54:47 2013 +0900
-
- aufs: bugfix, no i_[ug]id_write() for USER_NS
-
- i_[ug]id_write() using kstat is unnecessary. Replace it by direct
- assignment. Otherwise it causes a compilation error when CONFIG_USER_NS
- is enabled.
-
- Reported-by: justin <jlec@gentoo.org>
- Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
-
-diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c
-index d223d7d..ab140e1 100644
---- a/fs/aufs/i_op.c
-+++ b/fs/aufs/i_op.c
-@@ -821,8 +821,9 @@ static void au_refresh_iattr(struct inode *inode, struct kstat *st,
- unsigned int n;
-
- inode->i_mode = st->mode;
-- i_uid_write(inode, st->uid);
-- i_gid_write(inode, st->gid);
-+ /* don't i_[ug]id_write() here */
-+ inode->i_uid = st->uid;
-+ inode->i_gid = st->gid;
- inode->i_atime = st->atime;
- inode->i_mtime = st->mtime;
- inode->i_ctime = st->ctime;