summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-10-03 00:06:36 +0000
committerRichard Yao <ryao@gentoo.org>2012-10-03 00:06:36 +0000
commit986bdbfa939bfaf9fe58b93aa16063febb485bbf (patch)
treea9b93806b0aea77d22fe00b0228d5f1337f1bf69 /sys-kernel
parentVersion bump (bug #437026). (diff)
downloadgentoo-2-986bdbfa939bfaf9fe58b93aa16063febb485bbf.tar.gz
gentoo-2-986bdbfa939bfaf9fe58b93aa16063febb485bbf.tar.bz2
gentoo-2-986bdbfa939bfaf9fe58b93aa16063febb485bbf.zip
Sync spl-9999.ebuild with spl-0.6.0_rc11.ebuild - thanks prometheanfire
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/spl/ChangeLog5
-rw-r--r--sys-kernel/spl/spl-9999.ebuild9
2 files changed, 6 insertions, 8 deletions
diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index ef8b1b528e35..a94872dc2e41 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.29 2012/09/18 22:33:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.30 2012/10/03 00:06:36 ryao Exp $
+
+ 03 Oct 2012; Richard Yao <ryao@gentoo.org> spl-9999.ebuild:
+ Sync spl-9999.ebuild with spl-0.6.0_rc11.ebuild - thanks prometheanfire
*spl-0.6.0_rc11 (18 Sep 2012)
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index 1daa363a3b40..2c4ef2b84b4c 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.24 2012/08/31 19:54:56 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.25 2012/10/03 00:06:36 ryao Exp $
EAPI="4"
AUTOTOOLS_AUTORECONF="1"
@@ -35,9 +35,9 @@ pkg_setup() {
CONFIG_CHECK="
!DEBUG_LOCK_ALLOC
!GRKERNSEC_HIDESYM
- !PREEMPT
MODULES
KALLSYMS
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR
ZLIB_DEFLATE
ZLIB_INFLATE
"
@@ -54,11 +54,6 @@ 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
}