summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-04-04 00:21:32 +0000
committerMike Gilbert <floppym@gentoo.org>2012-04-04 00:21:32 +0000
commit65b3e1838566224b3b5dfd20f2f4d1bf9414e96f (patch)
tree148b1d272231b11248623e251343fcff3e30aca7 /sys-kernel
parentDev channel bump. (diff)
downloadhistorical-65b3e1838566224b3b5dfd20f2f4d1bf9414e96f.tar.gz
historical-65b3e1838566224b3b5dfd20f2f4d1bf9414e96f.tar.bz2
historical-65b3e1838566224b3b5dfd20f2f4d1bf9414e96f.zip
Implement fix for ZFSOnLinux upstream issue #631 and make improvements toward prefix support. Patch by Richard Yao.
Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/spl/ChangeLog6
-rw-r--r--sys-kernel/spl/Manifest10
-rw-r--r--sys-kernel/spl/spl-9999.ebuild7
3 files changed, 14 insertions, 9 deletions
diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index ee2b2a46cab9..3429622cada5 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.11 2012/03/05 00:37:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.12 2012/04/04 00:21:32 floppym Exp $
+
+ 04 Apr 2012; Mike Gilbert <floppym@gentoo.org> spl-9999.ebuild:
+ Implement fix for ZFSOnLinux upstream issue #631 and make improvements toward
+ prefix support. Patch by Richard Yao.
05 Mar 2012; Mike Gilbert <floppym@gentoo.org> spl-9999.ebuild:
Add check for KALLSYSMS.
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index a9d6780d53f9..305797674e5a 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD spl-9999.ebuild 1663 RMD160 52a5983d526fd21effa536f2df0d30f847fb922c SHA1 0c36b3e525f75d9d8ca7e6883b37f46d45187f2f SHA256 b4e4270cf44efb7ccc4bfeb6bab2cfdb0d18170c9f79ccd2b0d2d023484630ef
-MISC ChangeLog 1456 RMD160 8616c9f6942105b336f0426e4a9565a8969de9ae SHA1 f873f870bb4e4c85c2cee63865d5b4c955b9112b SHA256 b36c52ed549354ab9e7508c43b12a8b327933572ed4cbef23290c3b2d40db67c
+EBUILD spl-9999.ebuild 1704 RMD160 c2e5ab98069054625ad591b2d3bcfe1be0305ac2 SHA1 62ea8d1568da1bee1e7170f4f79f7bfafe58f9d3 SHA256 dcc59d102d1f22c203fd507aade091e358c269e5827b3240b639e2e52e1d3762
+MISC ChangeLog 1643 RMD160 9fa762edf001523c8855af93165c1280c189f772 SHA1 923ca9994df22df3aa938df9b09249c9979e0301 SHA256 0d3202cf5cf143f362f519072fd5cf1e4197c2baa28ead5a60224ff8044d4208
MISC metadata.xml 374 RMD160 a315b0ad1a5c228cb9406628cbce49afa38f6f18 SHA1 f33356682408f0f0a177702b4e33660a351973be SHA256 ae971627d7a77740537ab8c64cee66385a19127b8e62ad472374c1c940ae24e8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk9UCswACgkQC77qH+pIQ6S6XAD+P0+1tD4kRn5ac7EtBU54blF8
-+XZL9B2vPF6D/dRKY1gA/3rP06wIoMSD8e/BQzWhi8e/HAB1U/hRTABsALh5pYdP
-=bd6D
+iF4EAREIAAYFAk97lBIACgkQC77qH+pIQ6SHHwEAs7p1P4hAB2KvPJ8XGpsrqcln
+gobrQtz5/j3UzGz7ttwBALFUCVi1Lpdr4iNXYwursERI71NWoaEzjadERdGvUE8r
+=/CtR
-----END PGP SIGNATURE-----
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index b5dacd8b47e6..91cc25bba10b 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.11 2012/03/05 00:37:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.12 2012/04/04 00:21:32 floppym Exp $
EAPI="4"
@@ -26,6 +26,7 @@ pkg_setup() {
CONFIG_CHECK="
!DEBUG_LOCK_ALLOC
!PREEMPT
+ !PREEMPT_VOLUNTARY
MODULES
KALLSYMS
ZLIB_DEFLATE
@@ -45,8 +46,8 @@ src_configure() {
use custom-cflags || strip-flags
set_arch_to_kernel
local myeconfargs=(
- --bindir=/bin
- --sbindir=/sbin
+ --bindir=${EPREFIX}/bin
+ --sbindir=${EPREFIX}/sbin
--with-config=all
--with-linux="${KV_DIR}"
--with-linux-obj="${KV_OUT_DIR}"