summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-04-11 00:09:22 +0000
committerMike Gilbert <floppym@gentoo.org>2012-04-11 00:09:22 +0000
commit31a08de330528b2ce8f2fa2fc9f15845b5065b2b (patch)
treee344fedfb085f5820e31d008c333d7e275243c19 /sys-fs
parentVersion bump. (diff)
downloadgentoo-2-31a08de330528b2ce8f2fa2fc9f15845b5065b2b.tar.gz
gentoo-2-31a08de330528b2ce8f2fa2fc9f15845b5065b2b.tar.bz2
gentoo-2-31a08de330528b2ce8f2fa2fc9f15845b5065b2b.zip
Add kernel checks for EFI_PARTITION and PREEMPT_NONE. Patch by Richard Yao.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/zfs/ChangeLog5
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild12
2 files changed, 11 insertions, 6 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 1b7dd1cba2e3..0e0d5b291988 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,9 @@
# 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.15 2012/04/04 00:21:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.16 2012/04/11 00:09:22 floppym Exp $
+
+ 11 Apr 2012; Mike Gilbert <floppym@gentoo.org> zfs-9999.ebuild:
+ Add kernel checks for EFI_PARTITION and PREEMPT_NONE. Patch by Richard Yao.
04 Apr 2012; Mike Gilbert <floppym@gentoo.org> zfs-9999.ebuild:
Implement fix for ZFSOnLinux upstream issue #631 and make improvements toward
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 7e02f50dc7cd..ce1ffd821954 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.16 2012/04/04 00:21:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.17 2012/04/11 00:09:22 floppym Exp $
EAPI="4"
@@ -43,13 +43,15 @@ AUTOTOOLS_AUTORECONF="1"
AUTOTOOLS_IN_SOURCE_BUILD="1"
pkg_setup() {
- CONFIG_CHECK="MODULES
+ CONFIG_CHECK="!DEBUG_LOCK_ALLOC
!PREEMPT
!PREEMPT_VOLUNTARY
- !DEBUG_LOCK_ALLOC
+ BLK_DEV_LOOP
+ EFI_PARTITION
+ MODULES
+ PREEMPT_NONE
ZLIB_DEFLATE
- ZLIB_INFLATE
- BLK_DEV_LOOP"
+ ZLIB_INFLATE"
kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
check_extra_config
use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports."