| 1 |
floppym 12/02/29 00:29:36 |
| 2 |
|
| 3 |
Modified: metadata.xml zfs-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Update from Richard: Add missing dependencies, introduce USE flags to permit omission of ZFS Regression Test Suite and dracut module, add warning about lack of upstream support for x86, fix issue in ZFS Regression Test Suite. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sys-fs/zfs/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/metadata.xml?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/metadata.xml?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/metadata.xml?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/metadata.xml,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- metadata.xml 27 Jan 2012 17:06:14 -0000 1.1 |
| 23 |
+++ metadata.xml 29 Feb 2012 00:29:35 -0000 1.2 |
| 24 |
@@ -10,4 +10,8 @@ |
| 25 |
<email>floppym@g.o</email> |
| 26 |
<name>Mike Gilbert</name> |
| 27 |
</maintainer> |
| 28 |
+ <use> |
| 29 |
+ <flag name="dracut">Install dracut module</flag> |
| 30 |
+ <flag name="test-suite">Install regression test suite</flag> |
| 31 |
+ </use> |
| 32 |
</pkgmetadata> |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.14 sys-fs/zfs/zfs-9999.ebuild |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.14&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.14&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?r1=1.13&r2=1.14 |
| 41 |
|
| 42 |
Index: zfs-9999.ebuild |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v |
| 45 |
retrieving revision 1.13 |
| 46 |
retrieving revision 1.14 |
| 47 |
diff -u -r1.13 -r1.14 |
| 48 |
--- zfs-9999.ebuild 27 Feb 2012 05:36:38 -0000 1.13 |
| 49 |
+++ zfs-9999.ebuild 29 Feb 2012 00:29:35 -0000 1.14 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2012 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.13 2012/02/27 05:36:38 floppym Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.14 2012/02/29 00:29:35 floppym Exp $ |
| 55 |
|
| 56 |
EAPI="4" |
| 57 |
|
| 58 |
@@ -14,7 +14,7 @@ |
| 59 |
LICENSE="CDDL GPL-2" |
| 60 |
SLOT="0" |
| 61 |
KEYWORDS="" |
| 62 |
-IUSE="custom-cflags debug static-libs" |
| 63 |
+IUSE="custom-cflags debug dracut test-suite static-libs" |
| 64 |
|
| 65 |
DEPEND=" |
| 66 |
>=sys-kernel/spl-${PV} |
| 67 |
@@ -23,6 +23,16 @@ |
| 68 |
" |
| 69 |
RDEPEND="${DEPEND} |
| 70 |
!sys-fs/zfs-fuse |
| 71 |
+ sys-fs/udev |
| 72 |
+ test-suite? ( |
| 73 |
+ sys-apps/gawk |
| 74 |
+ sys-apps/util-linux |
| 75 |
+ sys-block/parted |
| 76 |
+ sys-fs/lsscsi |
| 77 |
+ sys-fs/mdadm |
| 78 |
+ sys-process/procps |
| 79 |
+ virtual/modutils |
| 80 |
+ ) |
| 81 |
" |
| 82 |
DEPEND+=" |
| 83 |
test? ( sys-fs/mdadm ) |
| 84 |
@@ -41,11 +51,14 @@ |
| 85 |
BLK_DEV_LOOP" |
| 86 |
kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" |
| 87 |
check_extra_config |
| 88 |
+ use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports." |
| 89 |
} |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
# Workaround for hard coded path |
| 93 |
sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die |
| 94 |
+ # Workaround rename |
| 95 |
+ sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die |
| 96 |
autotools-utils_src_prepare |
| 97 |
} |
| 98 |
|
| 99 |
@@ -77,4 +90,6 @@ |
| 100 |
src_install() { |
| 101 |
autotools-utils_src_install |
| 102 |
gen_usr_ldscript -a uutil nvpair zpool zfs |
| 103 |
+ use dracut || rm -rf "${ED}usr/share/dracut" |
| 104 |
+ use test-suite || rm -rf "${ED}usr/libexec" |
| 105 |
} |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.14 sys-fs/zfs/ChangeLog |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.14&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.14&content-type=text/plain |
| 113 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.13&r2=1.14 |
| 114 |
|
| 115 |
Index: ChangeLog |
| 116 |
=================================================================== |
| 117 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v |
| 118 |
retrieving revision 1.13 |
| 119 |
retrieving revision 1.14 |
| 120 |
diff -u -r1.13 -r1.14 |
| 121 |
--- ChangeLog 27 Feb 2012 05:36:38 -0000 1.13 |
| 122 |
+++ ChangeLog 29 Feb 2012 00:29:35 -0000 1.14 |
| 123 |
@@ -1,6 +1,11 @@ |
| 124 |
# ChangeLog for sys-fs/zfs |
| 125 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 126 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.13 2012/02/27 05:36:38 floppym Exp $ |
| 127 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.14 2012/02/29 00:29:35 floppym Exp $ |
| 128 |
+ |
| 129 |
+ 29 Feb 2012; Mike Gilbert <floppym@g.o> metadata.xml, zfs-9999.ebuild: |
| 130 |
+ Update from Richard: Add missing dependencies, introduce USE flags to permit |
| 131 |
+ omission of ZFS Regression Test Suite and dracut module, add warning about |
| 132 |
+ lack of upstream support for x86, fix issue in ZFS Regression Test Suite. |
| 133 |
|
| 134 |
27 Feb 2012; Mike Gilbert <floppym@g.o> zfs-9999.ebuild: |
| 135 |
Adjust dependencies. |
Archives