diff options
author | Justin Lecher <jlec@gentoo.org> | 2013-03-18 07:05:04 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2013-03-18 07:05:04 +0000 |
commit | 1a9f831804e76eb58bae00cdc839bf6d56aef193 (patch) | |
tree | cd0e6d0e3e9185023dcd9640ce38cbc81c31c583 /sys-kernel/aufs-sources | |
parent | Version bump (diff) | |
download | gentoo-2-1a9f831804e76eb58bae00cdc839bf6d56aef193.tar.gz gentoo-2-1a9f831804e76eb58bae00cdc839bf6d56aef193.tar.bz2 gentoo-2-1a9f831804e76eb58bae00cdc839bf6d56aef193.zip |
sys-kernel/aufs-sources: Drop old; Revert memcg patches that prevent OOM with too many dirty pages which caused ZFS to flush dirty pages to deadlock, see bug #462066; in 3.6, 3.7 and 3.8. Backported fixes from 3.8 to 3.7 that affect some of our Gentoo users.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sys-kernel/aufs-sources')
-rw-r--r-- | sys-kernel/aufs-sources/ChangeLog | 17 | ||||
-rw-r--r-- | sys-kernel/aufs-sources/aufs-sources-3.6.11-r1.ebuild | 57 | ||||
-rw-r--r-- | sys-kernel/aufs-sources/aufs-sources-3.6.11-r3.ebuild (renamed from sys-kernel/aufs-sources/aufs-sources-3.6.11-r2.ebuild) | 4 | ||||
-rw-r--r-- | sys-kernel/aufs-sources/aufs-sources-3.7.10-r2.ebuild (renamed from sys-kernel/aufs-sources/aufs-sources-3.7.10-r1.ebuild) | 4 | ||||
-rw-r--r-- | sys-kernel/aufs-sources/aufs-sources-3.7.10.ebuild | 64 | ||||
-rw-r--r-- | sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild | 62 | ||||
-rw-r--r-- | sys-kernel/aufs-sources/aufs-sources-3.8.2.ebuild | 64 | ||||
-rw-r--r-- | sys-kernel/aufs-sources/aufs-sources-3.8.3-r1.ebuild (renamed from sys-kernel/aufs-sources/aufs-sources-3.8.2-r2.ebuild) | 4 | ||||
-rw-r--r-- | sys-kernel/aufs-sources/aufs-sources-3.8.3.ebuild | 62 |
9 files changed, 22 insertions, 316 deletions
diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog index 24cf173687a3..e3a685544daf 100644 --- a/sys-kernel/aufs-sources/ChangeLog +++ b/sys-kernel/aufs-sources/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for sys-kernel/aufs-sources # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.21 2013/03/16 08:41:51 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.22 2013/03/18 07:05:04 jlec Exp $ + +*aufs-sources-3.8.3-r1 (18 Mar 2013) +*aufs-sources-3.7.10-r2 (18 Mar 2013) +*aufs-sources-3.6.11-r3 (18 Mar 2013) + + 18 Mar 2013; Justin Lecher <jlec@gentoo.org> -aufs-sources-3.6.11-r1.ebuild, + -aufs-sources-3.6.11-r2.ebuild, +aufs-sources-3.6.11-r3.ebuild, + -aufs-sources-3.7.10.ebuild, -aufs-sources-3.7.10-r1.ebuild, + +aufs-sources-3.7.10-r2.ebuild, -aufs-sources-3.8.2.ebuild, + -aufs-sources-3.8.2-r1.ebuild, -aufs-sources-3.8.2-r2.ebuild, + -aufs-sources-3.8.3.ebuild, +aufs-sources-3.8.3-r1.ebuild: + Drop old; Revert memcg patches that prevent OOM with too many dirty pages + which caused ZFS to flush dirty pages to deadlock, see bug #462066; in 3.6, + 3.7 and 3.8. Backported fixes from 3.8 to 3.7 that affect some of our Gentoo + users. *aufs-sources-3.8.3 (16 Mar 2013) diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.11-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.11-r1.ebuild deleted file mode 100644 index 1e4537997fc0..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-3.6.11-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 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.6.11-r1.ebuild,v 1.1 2013/03/03 18:30:03 jlec Exp $ - -EAPI=5 -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="12" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 eutils -detect_version -detect_arch - -AUFS_TARBALL="${P}.tar.xz" - -# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.6 > ${AUFS_TARBALL} -AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob module" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}" - -UNIPATCH_LIST=" - "${WORKDIR}"/aufs3-kbuild.patch - "${WORKDIR}"/aufs3-base.patch" -# ${WORKDIR}/aufs3-proc_map.patch" - -src_unpack() { - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" - unpack ${AUFS_TARBALL} - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die - cp -ri "${WORKDIR}"/{Documentation,fs} . || die - sed -i "s:__user::g" include/linux/aufs_type.h || die -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - if ! has_version sys-fs/aufs-util; then - einfo "In order to use aufs FS you need to install sys-fs/aufs-util" - fi -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.11-r2.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.11-r3.ebuild index 1ee18bf8fc12..ce4915932d48 100644 --- a/sys-kernel/aufs-sources/aufs-sources-3.6.11-r2.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-3.6.11-r3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2013 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.6.11-r2.ebuild,v 1.1 2013/03/07 11:54:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.11-r3.ebuild,v 1.1 2013/03/18 07:05:04 jlec Exp $ EAPI=5 ETYPE="sources" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="12" +K_GENPATCHES_VER="13" K_DEBLOB_AVAILABLE="1" inherit kernel-2 eutils detect_version diff --git a/sys-kernel/aufs-sources/aufs-sources-3.7.10-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.7.10-r2.ebuild index ad56f9bc51a0..6fff8d7b2915 100644 --- a/sys-kernel/aufs-sources/aufs-sources-3.7.10-r1.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-3.7.10-r2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2013 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.7.10-r1.ebuild,v 1.1 2013/03/07 11:54:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.7.10-r2.ebuild,v 1.1 2013/03/18 07:05:04 jlec Exp $ EAPI=5 ETYPE="sources" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="13" +K_GENPATCHES_VER="14" K_DEBLOB_AVAILABLE="1" inherit kernel-2 eutils detect_version diff --git a/sys-kernel/aufs-sources/aufs-sources-3.7.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.7.10.ebuild deleted file mode 100644 index 2075a047296f..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-3.7.10.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2013 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.7.10.ebuild,v 1.1 2013/03/03 18:30:03 jlec Exp $ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="13" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 eutils -detect_version -detect_arch - -AUFS_VERSION=3.7.6 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.7 > ${AUFS_TARBALL} -AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob module proc" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}" - -UNIPATCH_LIST=" - "${WORKDIR}"/aufs3-kbuild.patch - "${WORKDIR}"/aufs3-base.patch" - -PDEPEND=">=sys-fs/aufs-util-3.7" - -src_unpack() { - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" - use proc && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-proc.patch" - unpack ${AUFS_TARBALL} - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - if ! use proc; then - sed '/config AUFS_PROC_MAP/,/^$/d' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die - cp -i "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -ri "${WORKDIR}"/{Documentation,fs} . || die - sed -i "s:__user::g" include/uapi/linux/aufs_type.h || die -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - if ! has_version sys-fs/aufs-util; then - einfo "In order to use aufs FS you need to install sys-fs/aufs-util" - fi -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild deleted file mode 100644 index d313969782b6..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2013 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.8.2-r1.ebuild,v 1.2 2013/03/15 10:42:03 jlec Exp $ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="4" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 eutils -detect_version -detect_arch - -AUFS_VERSION=3.8.2 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.7 > ${AUFS_TARBALL} -AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob module proc" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}" - -UNIPATCH_LIST=" - "${WORKDIR}"/aufs3-kbuild.patch - "${WORKDIR}"/aufs3-base.patch" - -PDEPEND=">=sys-fs/aufs-util-3.8" - -src_unpack() { - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" - use proc && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-proc.patch" - unpack ${AUFS_TARBALL} - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - if ! use proc; then - sed '/config AUFS_PROC_MAP/,/^$/d' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die - cp -i "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -ri "${WORKDIR}"/{Documentation,fs} . || die -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - has_version sys-fs/aufs-util && \ - einfo "In order to use aufs FS you need to install sys-fs/aufs-util" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-3.8.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.8.2.ebuild deleted file mode 100644 index 207857ddab13..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-3.8.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2013 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.8.2.ebuild,v 1.1 2013/03/07 11:54:25 jlec Exp $ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="4" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 eutils -detect_version -detect_arch - -AUFS_VERSION=3.8.2 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.7 > ${AUFS_TARBALL} -AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob module proc" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}" - -UNIPATCH_LIST=" - "${WORKDIR}"/aufs3-kbuild.patch - "${WORKDIR}"/aufs3-base.patch" - -PDEPEND=">=sys-fs/aufs-util-3.7" - -src_unpack() { - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" - use proc && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-proc.patch" - unpack ${AUFS_TARBALL} - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - if ! use proc; then - sed '/config AUFS_PROC_MAP/,/^$/d' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die - cp -i "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -ri "${WORKDIR}"/{Documentation,fs} . || die - sed -i "s:__user::g" include/uapi/linux/aufs_type.h || die -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - if ! has_version sys-fs/aufs-util; then - einfo "In order to use aufs FS you need to install sys-fs/aufs-util" - fi -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-3.8.2-r2.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.8.3-r1.ebuild index 578162ee176c..f93161760403 100644 --- a/sys-kernel/aufs-sources/aufs-sources-3.8.2-r2.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-3.8.3-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2013 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.8.2-r2.ebuild,v 1.1 2013/03/15 10:42:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.8.3-r1.ebuild,v 1.1 2013/03/18 07:05:04 jlec Exp $ EAPI=5 ETYPE="sources" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="4" +K_GENPATCHES_VER="6" K_DEBLOB_AVAILABLE="1" inherit kernel-2 eutils detect_version diff --git a/sys-kernel/aufs-sources/aufs-sources-3.8.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.8.3.ebuild deleted file mode 100644 index 231bd9452eaa..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-3.8.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2013 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.8.3.ebuild,v 1.1 2013/03/16 08:41:51 jlec Exp $ - -EAPI=5 - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="5" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 eutils -detect_version -detect_arch - -AUFS_VERSION=3.8_p20130318 -AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" -# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.8 > aufs-sources-${AUFS_VERSION}.tar -AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob module proc" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}" - -UNIPATCH_LIST=" - "${WORKDIR}"/aufs3-kbuild.patch - "${WORKDIR}"/aufs3-base.patch" - -PDEPEND=">=sys-fs/aufs-util-3.8" - -src_unpack() { - use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" - use proc && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-proc.patch" - unpack ${AUFS_TARBALL} - kernel-2_src_unpack -} - -src_prepare() { - if ! use module; then - sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - if ! use proc; then - sed '/config AUFS_PROC_MAP/,/^$/d' -i "${WORKDIR}"/fs/aufs/Kconfig || die - fi - cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die - cp -i "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die - cp -ri "${WORKDIR}"/{Documentation,fs} . || die -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" - has_version sys-fs/aufs-util && \ - einfo "In order to use aufs FS you need to install sys-fs/aufs-util" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} |