diff options
| author |   Richard Yao <ryao@gentoo.org> | 2012-06-25 21:19:41 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2012-06-25 21:19:41 +0000 |
| commit | 87a2da6a507ddc98937875cee30518e7b5e703d6 (patch) | |
| tree | e7b20a203220e9d3ff73a957f23dc1af34890c1c /sys-fs | |
| parent | Fix additional deadlock fix regression (diff) | |
| download | gentoo-2-87a2da6a507ddc98937875cee30518e7b5e703d6.tar.gz gentoo-2-87a2da6a507ddc98937875cee30518e7b5e703d6.tar.bz2 gentoo-2-87a2da6a507ddc98937875cee30518e7b5e703d6.zip | |
Add config checks for initramfs support
(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-r3.ebuild | 6 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog index e61c829dff2d..bbcb4f42bdaf 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.31 2012/06/25 21:03:27 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.32 2012/06/25 21:19:41 ryao Exp $ + + 25 Jun 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9-r3.ebuild, + zfs-9999.ebuild: + Add config checks for initramfs support *zfs-0.6.0_rc9-r3 (25 Jun 2012) diff --git a/sys-fs/zfs/zfs-0.6.0_rc9-r3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc9-r3.ebuild index d771ce78aab7..4e9acca2483b 100644 --- a/sys-fs/zfs/zfs-0.6.0_rc9-r3.ebuild +++ b/sys-fs/zfs/zfs-0.6.0_rc9-r3.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-r3.ebuild,v 1.1 2012/06/25 21:03:27 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9-r3.ebuild,v 1.2 2012/06/25 21:19:41 ryao Exp $ EAPI="4" @@ -64,7 +64,9 @@ pkg_setup() { MODULES ZLIB_DEFLATE ZLIB_INFLATE" - use rootfs && CONFIG_CHECK="${CONFIG_CHECK} DEVTMPFS" + use rootfs && \ + CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD + DEVTMPFS" kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" check_extra_config } diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index ac18c0ae2ffc..82f35e385b05 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.24 2012/06/18 15:19:14 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.25 2012/06/25 21:19:41 ryao Exp $ EAPI="4" @@ -64,7 +64,9 @@ pkg_setup() { MODULES ZLIB_DEFLATE ZLIB_INFLATE" - use rootfs && CONFIG_CHECK="${CONFIG_CHECK} DEVTMPFS" + use rootfs && \ + CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD + DEVTMPFS" kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" check_extra_config } @@ -84,6 +86,7 @@ src_prepare() { 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" + epatch "${FILESDIR}/${P}-range-lock-caller-allocate.patch" fi autotools-utils_src_prepare |