Remove CONFIG_PREEMPT_VOLUNTARY restriction

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 14 insertions, 103 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index f3ae644c73a1..6e349a24a0da 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/spl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.22 2012/07/10 00:26:07 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.23 2012/07/28 21:46:16 ryao Exp $
+
+  28 Jul 2012; Richard Yao <ryao@gentoo.org> -spl-0.6.0_rc9-r1.ebuild,
+  spl-0.6.0_rc9-r2.ebuild, spl-9999.ebuild:
+  Remove CONFIG_PREEMPT_VOLUNTARY restriction
 
 *spl-0.6.0_rc9-r2 (10 Jul 2012)
 
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index f6b122bb74e1..51e6e73b87ad 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,9 +1,8 @@
-AUX spl-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch 2071 RMD160 bdfee4b1bf700bc3d0a375dcbb6181034fc1a417 SHA1 3de9a4379b36f9b5fed5b0eeea99fa1b5cd47242 SHA256 d34d56201046c6464141c50c815a956e200260c4b17a057af2dde6fdb5fcf949
-AUX spl-0.6.0_rc9-constify-free-functions.patch 2973 RMD160 29bf9d0882baffb879a0dbd21cb1a792cd57ecc4 SHA1 fddb143b6f10c67138c967ec39a62bad76bdf522 SHA256 161a292a104e9ffc386da6c5924927db5721c4745378f865e46fd803d5250314
-AUX spl-0.6.0_rc9-detect-kernel-honors-gfp-flags.patch 2896 RMD160 857c1dd3705dc6a19b1610e96b9fac3ae8f1de45 SHA1 2255e43e72aca0194eaca79f641e4aa10b635fda SHA256 811d8db0a99b26af03be5150eb9c6ac970933a34f022980d275a86bf4947aed1
+AUX spl-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch 2071 SHA256 d34d56201046c6464141c50c815a956e200260c4b17a057af2dde6fdb5fcf949 SHA512 8decd4a803b85b46b5c241eeb0dd7b44e0491a972b08094d763a20d5ef21624ff0bbe79e56098600702f78f506e842c8bbfc3bc94067b86531399b0ba0b4285e WHIRLPOOL 5fbe166099b10e1281e5d824e25acd7f4467766d865e6c297dd8b503906b12bc63221babb0fb6e9fade65679a8637489cec16ac3e6e14d54457c9cda858db9db
+AUX spl-0.6.0_rc9-constify-free-functions.patch 2973 SHA256 161a292a104e9ffc386da6c5924927db5721c4745378f865e46fd803d5250314 SHA512 df2f559ded98d4efc6e84f9f75bd995915ef4d64a14a807a64d5258265cc678e5976b2f53b8a771790758e73ab2d9bdeea83b924f673d89906398e162d5aea65 WHIRLPOOL efe3929400b07d200fe3f27ac02d9d797a2833a39a54362d66ee98a4136780c3ad61c1a9d556d0fb7210135c256d774b04f1c6a17794ec9692fc3430b6c9f695
+AUX spl-0.6.0_rc9-detect-kernel-honors-gfp-flags.patch 2896 SHA256 811d8db0a99b26af03be5150eb9c6ac970933a34f022980d275a86bf4947aed1 SHA512 e579d5a29354f5da8d6543a8ef68351593554d5b25a61ceca23dd2ead753f5cc7dd7575a5989fac8506fd817a7fc6edaf1f90656127c41055021238338d6c0a0 WHIRLPOOL 48bcccd7b27fd4f951cd1e4fc860de6c62e1499501f58674d3800fe476bbe6eb55216d0243fa1987e022d4ffd2c30de43646a8cd85eab4fc7f7095a9da511b86
 DIST spl-0.6.0-rc9.tar.gz 449444 RMD160 50673f08253d5939f84dfe09e66c409b15d553a9 SHA1 c4c0ba92652f4635a3e0ffe62de68f9e4bd59a4c SHA256 9b1f7d0c94e3b70942f460d726180c3bed0b6b6cd71fc90d4d52dc6b218d17dd
-EBUILD spl-0.6.0_rc9-r1.ebuild 2121 RMD160 5402e844d86e9ee3359deac6c5f2963eb8afc89a SHA1 5ea460bf13873af86b0f64e4e4d7c8c975a6a717 SHA256 be70b8ba3537badd93282b243c2d3270c4fd2dbde75bbc9208d03c284a719e5c
-EBUILD spl-0.6.0_rc9-r2.ebuild 2187 RMD160 57f4eb921be4dc325536dddc57cd6852d656cb35 SHA1 eb94be16cb6ec7c8e7506ba7cf4a7c277318d6e3 SHA256 0c63b1ddfb9edbadf9a26b2ad38a4579acf4c52201cd063d4540ee7861ffe4bf
-EBUILD spl-9999.ebuild 2180 RMD160 d29b8fdec947741708aa282dd7409b8d2554bc7c SHA1 2aada7f75cba69b1814c33f7b7994f507fc9dfa9 SHA256 0a7be8eccb1725ee5a90dfb0d657ee53885fe4e8b0881c063219a37ff5570e56
-MISC ChangeLog 3228 RMD160 224bbc7880e4ccfbd35be844b916a599d1cf793f SHA1 ee8d36dc7c4bcf63ca3a30309dacc60090052c17 SHA256 485a82379b9a42d7829751017b1cf8ee2ff272b08da43217c1b1f2fdf8c5c934
-MISC metadata.xml 228 RMD160 7f4566d402fa232a1d2bb22589d7fe8cc72a241c SHA1 9a2f59b4e342ac0f1e064255f59b0bdec32ab1a9 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8
+EBUILD spl-0.6.0_rc9-r2.ebuild 2166 SHA256 b61a2a040f89f76a9aacbe147d670acc25b6331173694a2ebc7391320295013f SHA512 6334e3a33f108e4f585b8ccdc6b4f10f3dc7bdd00b4ba8ed4c28871da4699ee7440aac360d74a1321d2089d8e29df61560d97afd8c48e4a8421717b07b8d9a4f WHIRLPOOL 88aac597afd183ed12ddb2cdd5d654024330e960f93a3e7675b08041298d7173fab78a7a3df573f8701158ca81413f9ad8be43d5527db5816beb5dcbf62af1fc
+EBUILD spl-9999.ebuild 2159 SHA256 e81a63e802e6e337be426b4e48c604e43969ae73e6c32f828e20a79dd92263ea SHA512 4b01138669d929d640cc1f3cab5c5fb8624a81cc5ec7fc27dc9a44048c0f21105bf2d03a54dc4f96c9b1f572407569090060f0ff1823a8ffdfc051f5f2bda57e WHIRLPOOL 626dc4ec79e72d091553f28a3037661298b6c3c72db71e43caab900af5b89ebcf56a6a193b2e4578c99c3046cc0247b9ac6f5374c7365e37e7c544291e41d89c
+MISC ChangeLog 3390 SHA256 8f99478805e1d4ffd11dd61eecbed71c2bdb999acd8341dbf00bc21b5e2415ac SHA512 dc43e389f6a18a24867497dd48c04d9e4ae322e5147138cc61c4a5a8ea2659350ae16181fdc501f28141939243a8104e5c211ddc595c8691ff3c3c117f4c26d9 WHIRLPOOL 6abd15e3c677e7416212b412d5f044401598a335ddf3af91ec7d392bb902dd5144ec1204b4705120ecfad48818c1d219e8f3c4ac8b90628820ff66ff0ce8e478
+MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
diff --git a/sys-kernel/spl/spl-0.6.0_rc9-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc9-r1.ebuild
deleted file mode 100644
index 1691bf41858f..000000000000
--- a/sys-kernel/spl/spl-0.6.0_rc9-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9-r1.ebuild,v 1.1 2012/06/25 17:54:06 ryao Exp $
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	inherit eutils versionator
-	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="~amd64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="custom-cflags debug"
-
-RDEPEND="!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		!PREEMPT
-		!PREEMPT_VOLUNTARY
-		MODULES
-		KALLSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-	check_extra_config
-}
-
-src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	if [ ${PV} != "9999" ]
-	then
-		epatch "${FILESDIR}/${P}-detect-kernel-honors-gfp-flags.patch"
-		epatch "${FILESDIR}/${P}-constify-free-functions.patch"
-	fi
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	if [[ ! -e /proc/modules ]]
-	then
-		die  "Missing /proc/modules"
-	elif [[ $UID -ne 0 ]]
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	elif grep -q '^spl ' /proc/modules
-	then
-		ewarn "Cannot run make check tests with module spl loaded."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.0_rc9-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc9-r2.ebuild
index 39ab00567ef2..5b5059a90201 100644
--- a/sys-kernel/spl/spl-0.6.0_rc9-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc9-r2.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-kernel/spl/spl-0.6.0_rc9-r2.ebuild,v 1.1 2012/07/10 00:26:07 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9-r2.ebuild,v 1.2 2012/07/28 21:46:16 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -35,7 +35,6 @@ pkg_setup() {
 		!DEBUG_LOCK_ALLOC
 		!GRKERNSEC_HIDESYM
 		!PREEMPT
-		!PREEMPT_VOLUNTARY
 		MODULES
 		KALLSYMS
 		ZLIB_DEFLATE
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index 1b482f6d4c80..04fcbb5b6a2d 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-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-kernel/spl/spl-9999.ebuild,v 1.20 2012/07/10 00:26:07 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.21 2012/07/28 21:46:16 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -35,7 +35,6 @@ pkg_setup() {
 		!DEBUG_LOCK_ALLOC
 		!GRKERNSEC_HIDESYM
 		!PREEMPT
-		!PREEMPT_VOLUNTARY
 		MODULES
 		KALLSYMS
 		ZLIB_DEFLATE