diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-02-24 22:35:35 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-02-24 22:35:35 +0000 |
| commit | 43163fc44275c0f304a506091b4ae99800736814 (patch) | |
| tree | 21c05dd754064acf8f711d6563d0fba8093ecaff /sys-kernel | |
| parent | Version bump wrt #405651 by "teidakankan" (diff) | |
| download | gentoo-2-43163fc44275c0f304a506091b4ae99800736814.tar.gz gentoo-2-43163fc44275c0f304a506091b4ae99800736814.tar.bz2 gentoo-2-43163fc44275c0f304a506091b4ae99800736814.zip | |
Updates from Richard Yao for bug 405201.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/spl/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-kernel/spl/spl-9999.ebuild | 35 |
2 files changed, 38 insertions, 2 deletions
diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog index 511e00b976dd..a961325afb13 100644 --- a/sys-kernel/spl/ChangeLog +++ b/sys-kernel/spl/ChangeLog @@ -1,6 +1,9 @@ # 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.6 2012/02/14 03:13:48 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.7 2012/02/24 22:35:35 floppym Exp $ + + 24 Feb 2012; Mike Gilbert <floppym@gentoo.org> spl-9999.ebuild: + Updates from Richard Yao for bug 405201. 14 Feb 2012; Mike Gilbert <floppym@gentoo.org> spl-9999.ebuild: Per Richard, add debug USE flag. diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild index 3ca07e7b05d8..eb40944fc956 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.6 2012/02/14 03:13:48 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.7 2012/02/24 22:35:35 floppym Exp $ EAPI="4" @@ -22,6 +22,21 @@ AT_M4DIR="config" AUTOTOOLS_AUTORECONF="1" AUTOTOOLS_IN_SOURCE_BUILD="1" +pkg_setup() { + CONFIG_CHECK="!PREEMPT + !DEBUG_LOCK_ALLOC + 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 + autotools-utils_src_prepare +} + src_configure() { set_arch_to_kernel local myeconfargs=( @@ -33,3 +48,21 @@ src_configure() { ) 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 + +} |