Add 0.6.0-rc10 release

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

4 files changed, 102 insertions, 9 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 6e349a24a0da..8e6fd0f25f70 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2012/07/28 21:46:16 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.24 2012/08/15 23:03:39 ryao Exp $
+
+*spl-0.6.0_rc10 (15 Aug 2012)
+
+  15 Aug 2012; Richard Yao <ryao@gentoo.org> +spl-0.6.0_rc10.ebuild,
+  spl-9999.ebuild:
+  Add 0.6.0-rc10 release
 
   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:
@@ -89,4 +95,3 @@
   27 Jan 2012; Mike Gilbert <floppym@gentoo.org> +metadata.xml,
   +spl-9999.ebuild:
   New pacakge.
-
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 51e6e73b87ad..f31bad677e67 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,8 +1,10 @@
 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
+DIST spl-0.6.0-rc10.tar.gz 523189 SHA256 b25a748b18522f38b495f3577905ccd296f2782d1180140a05bd1efa19113ea0 SHA512 c5a01c9d42afcc3c4069b771fed2cbdc20d621994d2709a06057d93aeecc1b15c442cf5bce4cced90ecf7ac841f610e0b55b678e2bde8b853aeefac4402baf19 WHIRLPOOL 961edac42c35b1ecf65748eb2fc9876ed8cf1207307eedaba41a381e519589859ad5bbe468f7b94d563ec954e10c47237b4540f63a7ea211bbf9d92158f06b11
+DIST spl-0.6.0-rc9.tar.gz 449444 SHA256 9b1f7d0c94e3b70942f460d726180c3bed0b6b6cd71fc90d4d52dc6b218d17dd
+EBUILD spl-0.6.0_rc10.ebuild 2052 SHA256 d368a176d78c7cc0b19b71b0a4f6bd7e92e4101721ffb2e8ac749bd9df3f0f3c SHA512 e8b3901a7fdd64e5ba4cbc1e17dea0a23d41cd45148fbfe49572ec95176748cf41ac9604b4bc1b6661e35ff89946039fab6e2bd16d56a34d0e9652d98558f641 WHIRLPOOL fe6942e00fb51778762b11dbd2999056f4be1aa3ae1ee1b70a575bdefd29e0cf2d313cdd90997f41680f1e1f31ffb2554587fab0694133fce52adc01fbb9ab28
 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
+EBUILD spl-9999.ebuild 2047 SHA256 343573fa5ef294cd0ca2cc8343d33a18ed85a089990071950bbfa16b28d0db3b SHA512 db5203004494536caadb6f080f9725bcbe8737f27354b3550dde1f9a25eaae8e4a728f0f64b051538d72bbcabe674803a7cfad5675acb9f9e7cd32a311a12af3 WHIRLPOOL b55d4afc6b7ddb5518bff5eb779623f5345ae10d9d4d54e1f9e99aa2d2bc4852645ec81e87cdaefec1e0ed8bb83e858362524486c3771c7ef619d0f5d77932ee
+MISC ChangeLog 3534 SHA256 4730f1929d9c8e04204d45b73b84f1dac9fc394cac3560fe36e8a07f1a41ed56 SHA512 e372c675b62b5545414a3b890f45665505eeb3ea1a21aec3d9cf3319ee1566035e17c4281774fe7de21d662be21ce6bb06a80356afa57b37864f7b9272f82533 WHIRLPOOL 6a12a62a35e3b14c73790829924de08025bcc5eb0b0c781fe1aa7dbea90c5c6174760473a21a848aab9105c0814c004ef21764ea76f1d2b24458b2491e73334b
 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
diff --git a/sys-kernel/spl/spl-0.6.0_rc10.ebuild b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
new file mode 100644
index 000000000000..22dd4fa5a775
--- /dev/null
+++ b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
@@ -0,0 +1,88 @@
+# 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_rc10.ebuild,v 1.1 2012/08/15 23:03:39 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
+		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}/${PN}-0.6.0_rc9-alias-km-sleep-with-km-pushpage.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-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index 04fcbb5b6a2d..aace23b254b9 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.21 2012/07/28 21:46:16 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.22 2012/08/15 23:03:39 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -50,9 +50,7 @@ src_prepare() {
 
 	if [ ${PV} != "9999" ]
 	then
-		epatch "${FILESDIR}/${P}-detect-kernel-honors-gfp-flags.patch"
-		epatch "${FILESDIR}/${P}-constify-free-functions.patch"
-		epatch "${FILESDIR}/${P}-alias-km-sleep-with-km-pushpage.patch"
+		epatch "${FILESDIR}/${PN}-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch"
 	fi
 
 	autotools-utils_src_prepare