| 1 |
floppym 12/04/04 00:21:49 |
| 2 |
|
| 3 |
Modified: zfs-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Implement fix for ZFSOnLinux upstream issue #631 and make improvements toward prefix support. Patch by Richard Yao. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.16 sys-fs/zfs/zfs-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.16&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.16&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?r1=1.15&r2=1.16 |
| 15 |
|
| 16 |
Index: zfs-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v |
| 19 |
retrieving revision 1.15 |
| 20 |
retrieving revision 1.16 |
| 21 |
diff -u -r1.15 -r1.16 |
| 22 |
--- zfs-9999.ebuild 4 Mar 2012 19:46:38 -0000 1.15 |
| 23 |
+++ zfs-9999.ebuild 4 Apr 2012 00:21:49 -0000 1.16 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.15 2012/03/04 19:46:38 mr_bones_ Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.16 2012/04/04 00:21:49 floppym Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -23,7 +23,7 @@ |
| 33 |
" |
| 34 |
RDEPEND="${DEPEND} |
| 35 |
!sys-fs/zfs-fuse |
| 36 |
- sys-fs/udev |
| 37 |
+ !prefix? ( sys-fs/udev ) |
| 38 |
test-suite? ( |
| 39 |
sys-apps/gawk |
| 40 |
sys-apps/util-linux |
| 41 |
@@ -45,13 +45,14 @@ |
| 42 |
pkg_setup() { |
| 43 |
CONFIG_CHECK="MODULES |
| 44 |
!PREEMPT |
| 45 |
+ !PREEMPT_VOLUNTARY |
| 46 |
!DEBUG_LOCK_ALLOC |
| 47 |
ZLIB_DEFLATE |
| 48 |
ZLIB_INFLATE |
| 49 |
BLK_DEV_LOOP" |
| 50 |
kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" |
| 51 |
check_extra_config |
| 52 |
- use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports." |
| 53 |
+ use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports." |
| 54 |
} |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
@@ -66,12 +67,12 @@ |
| 58 |
use custom-cflags || strip-flags |
| 59 |
set_arch_to_kernel |
| 60 |
local myeconfargs=( |
| 61 |
- --bindir=/bin |
| 62 |
- --sbindir=/sbin |
| 63 |
+ --bindir=${EPREFIX}/bin |
| 64 |
+ --sbindir=${EPREFIX}/sbin |
| 65 |
--with-config=all |
| 66 |
--with-linux="${KV_DIR}" |
| 67 |
--with-linux-obj="${KV_OUT_DIR}" |
| 68 |
- --with-udevdir=/lib/udev |
| 69 |
+ --with-udevdir=${EPREFIX}/lib/udev |
| 70 |
$(use_enable debug) |
| 71 |
) |
| 72 |
autotools-utils_src_configure |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.15 sys-fs/zfs/ChangeLog |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.15&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.15&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.14&r2=1.15 |
| 81 |
|
| 82 |
Index: ChangeLog |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v |
| 85 |
retrieving revision 1.14 |
| 86 |
retrieving revision 1.15 |
| 87 |
diff -u -r1.14 -r1.15 |
| 88 |
--- ChangeLog 29 Feb 2012 00:29:35 -0000 1.14 |
| 89 |
+++ ChangeLog 4 Apr 2012 00:21:49 -0000 1.15 |
| 90 |
@@ -1,6 +1,10 @@ |
| 91 |
# ChangeLog for sys-fs/zfs |
| 92 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 93 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.14 2012/02/29 00:29:35 floppym Exp $ |
| 94 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.15 2012/04/04 00:21:49 floppym Exp $ |
| 95 |
+ |
| 96 |
+ 04 Apr 2012; Mike Gilbert <floppym@g.o> zfs-9999.ebuild: |
| 97 |
+ Implement fix for ZFSOnLinux upstream issue #631 and make improvements toward |
| 98 |
+ prefix support. Patch by Richard Yao. |
| 99 |
|
| 100 |
29 Feb 2012; Mike Gilbert <floppym@g.o> metadata.xml, zfs-9999.ebuild: |
| 101 |
Update from Richard: Add missing dependencies, introduce USE flags to permit |
Archives