summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-08-24 14:46:08 +0000
committerRichard Yao <ryao@gentoo.org>2012-08-24 14:46:08 +0000
commit6478e75f8c3493fd51d808952ab32014ac7ed3d3 (patch)
tree1010e9228bd26c18d2bd3af47740d0fc464b0373 /sys-fs
parentversion bump (diff)
downloadgentoo-2-6478e75f8c3493fd51d808952ab32014ac7ed3d3.tar.gz
gentoo-2-6478e75f8c3493fd51d808952ab32014ac7ed3d3.tar.bz2
gentoo-2-6478e75f8c3493fd51d808952ab32014ac7ed3d3.zip
Add check for CONFIG_IOSCHED_NOOP.
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/zfs-kmod/ChangeLog6
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild4
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-9999.ebuild4
3 files changed, 11 insertions, 3 deletions
diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index f7686c557d38..923ac90525f5 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/zfs-kmod
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.2 2012/08/22 07:50:06 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.3 2012/08/24 14:46:08 ryao Exp $
+
+ 24 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.0_rc10.ebuild,
+ zfs-kmod-9999.ebuild:
+ Add check for CONFIG_IOSCHED_NOOP.
22 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.0_rc10.ebuild,
zfs-kmod-9999.ebuild:
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
index 9062afb8517e..f8a193090d48 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.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-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.2 2012/08/22 07:50:06 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.3 2012/08/24 14:46:08 ryao Exp $
EAPI="4"
@@ -13,6 +13,7 @@ inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-util
if [ ${PV} == "9999" ] ; then
inherit git-2
EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
+ S="${WORKDIR}/zfs-${MY_PV}"
else
inherit eutils versionator
MY_PV=$(replace_version_separator 3 '-')
@@ -42,6 +43,7 @@ pkg_setup() {
!PREEMPT
BLK_DEV_LOOP
EFI_PARTITION
+ IOSCHED_NOOP
MODULES
!PAX_KERNEXEC_PLUGIN_METHOD_OR
ZLIB_DEFLATE
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 0c3ed45d3947..7d433fa931fc 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-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-kmod/zfs-kmod-9999.ebuild,v 1.2 2012/08/22 07:50:06 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.3 2012/08/24 14:46:08 ryao Exp $
EAPI="4"
@@ -13,6 +13,7 @@ inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-util
if [ ${PV} == "9999" ] ; then
inherit git-2
EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
+ S="${WORKDIR}/zfs-${MY_PV}"
else
inherit eutils versionator
MY_PV=$(replace_version_separator 3 '-')
@@ -42,6 +43,7 @@ pkg_setup() {
!PREEMPT
BLK_DEV_LOOP
EFI_PARTITION
+ IOSCHED_NOOP
MODULES
!PAX_KERNEXEC_PLUGIN_METHOD_OR
ZLIB_DEFLATE