diff options
| author |   Richard Yao <ryao@gentoo.org> | 2012-06-18 15:19:14 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2012-06-18 15:19:14 +0000 |
| commit | 08c0a0f1b79befaee8cf0dbb81d5c7cfa8b29e47 (patch) | |
| tree | 41fce8f46048529810a45d9f748c307627606435 /sys-fs | |
| parent | Keep spl-0.6.0_rc9.ebuild and spl-9999.ebuild in sync (diff) | |
| download | gentoo-2-08c0a0f1b79befaee8cf0dbb81d5c7cfa8b29e47.tar.gz gentoo-2-08c0a0f1b79befaee8cf0dbb81d5c7cfa8b29e47.tar.bz2 gentoo-2-08c0a0f1b79befaee8cf0dbb81d5c7cfa8b29e47.zip | |
Keyword ~amd64
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/zfs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-0.6.0_rc9.ebuild | 4 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 12 |
3 files changed, 16 insertions, 6 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog index 00996e287d10..80acf821abc5 100644 --- a/sys-fs/zfs/ChangeLog +++ b/sys-fs/zfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/zfs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.26 2012/06/17 17:38:43 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.27 2012/06/18 15:19:14 ryao Exp $ + + 18 Jun 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9.ebuild, + zfs-9999.ebuild: + Keyword ~amd64 17 Jun 2012; Richard Yao <ryao@gentoo.org> +files/zfs-0.6.0_rc9-remove-pfmalloc-1-of-3.patch, diff --git a/sys-fs/zfs/zfs-0.6.0_rc9.ebuild b/sys-fs/zfs/zfs-0.6.0_rc9.ebuild index 3273babcf438..56b9ed2068c5 100644 --- a/sys-fs/zfs/zfs-0.6.0_rc9.ebuild +++ b/sys-fs/zfs/zfs-0.6.0_rc9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild,v 1.4 2012/06/17 17:38:43 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild,v 1.5 2012/06/18 15:19:14 ryao Exp $ EAPI="4" @@ -18,7 +18,7 @@ else MY_PV=$(replace_version_separator 3 '-') SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="" + KEYWORDS="~amd64" fi DESCRIPTION="Native ZFS for Linux" diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 24ec586dcfed..ac18c0ae2ffc 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.23 2012/06/17 14:07:51 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.24 2012/06/18 15:19:14 ryao Exp $ EAPI="4" @@ -18,7 +18,7 @@ else MY_PV=$(replace_version_separator 3 '-') SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="" + KEYWORDS="~amd64" fi DESCRIPTION="Native ZFS for Linux" @@ -29,7 +29,7 @@ SLOT="0" IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs" DEPEND=" - >=sys-kernel/spl-${PV} + =sys-kernel/spl-${PV}* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] " @@ -78,6 +78,12 @@ src_prepare() { if [ ${PV} != "9999" ] then epatch "${FILESDIR}/${P}-hardened-support.patch" + + # Fix various deadlocks + epatch "${FILESDIR}/${P}-use-pushpage.patch" + epatch "${FILESDIR}/${P}-remove-pfmalloc-1-of-3.patch" + epatch "${FILESDIR}/${P}-remove-pfmalloc-2-of-3.patch" + epatch "${FILESDIR}/${P}-remove-pfmalloc-3-of-3.patch" fi autotools-utils_src_prepare |