diff options
author | Mike Gilbert <floppym@gentoo.org> | 2012-02-29 00:29:35 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2012-02-29 00:29:35 +0000 |
commit | 9512528cb1a98e1e2553db6e3b93471ea12034be (patch) | |
tree | cdc80a278711e0bb117c9c94bdd5a030c3dcdc05 /sys-fs | |
parent | drop cxxabi.h relocation since it appears to be unnecessary nowadays with our... (diff) | |
download | historical-9512528cb1a98e1e2553db6e3b93471ea12034be.tar.gz historical-9512528cb1a98e1e2553db6e3b93471ea12034be.tar.bz2 historical-9512528cb1a98e1e2553db6e3b93471ea12034be.zip |
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.
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/zfs/ChangeLog | 7 | ||||
-rw-r--r-- | sys-fs/zfs/Manifest | 12 | ||||
-rw-r--r-- | sys-fs/zfs/metadata.xml | 4 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 19 |
4 files changed, 33 insertions, 9 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog index 20d7cf1ab2b9..a0df6e8f62d6 100644 --- a/sys-fs/zfs/ChangeLog +++ b/sys-fs/zfs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/zfs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.13 2012/02/27 05:36:38 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.14 2012/02/29 00:29:35 floppym Exp $ + + 29 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml, zfs-9999.ebuild: + 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. 27 Feb 2012; Mike Gilbert <floppym@gentoo.org> zfs-9999.ebuild: Adjust dependencies. diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index a57737aa6042..b4ac4ffd61f5 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,13 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD zfs-9999.ebuild 1664 RMD160 35e04e8efba205853fa08404a3d2079d7a2a0b3e SHA1 1f83e8e543cafbded7016e18ea23a5b0117501a6 SHA256 9b64964482b4a79d0a4c8f4c2c6297e78ba3669bb52dec4b1f909ffac85608e1 -MISC ChangeLog 1798 RMD160 00d4825fa7185a07cc4ddec5abbf9278b1d47024 SHA1 fa33098d7fb7483d84540e18ffb6f989896cd064 SHA256 550a6067e8685b575f7507d50d39d8b73fbe10f92af62974645c4337ccf7e064 -MISC metadata.xml 374 RMD160 a315b0ad1a5c228cb9406628cbce49afa38f6f18 SHA1 f33356682408f0f0a177702b4e33660a351973be SHA256 ae971627d7a77740537ab8c64cee66385a19127b8e62ad472374c1c940ae24e8 +EBUILD zfs-9999.ebuild 2142 RMD160 696a3cb3ec5268d0a44fa3e95afe25088bf32a33 SHA1 efb9d54ec6f5c506e3b16f04c8890e5b1dfccefa SHA256 abcbc16c7665effb330651d0ada08dfcf2fc4247cf84273fb9627b3c27aff4cc +MISC ChangeLog 2111 RMD160 ac709bd7f414113425a232ce7894ae75805774b0 SHA1 0edd82681eba50050e06478255b994e023bf66f7 SHA256 fbbb1721d81b7a3e1a5659d7b4cd21a666532f13e25e59c50afbe2481a17862f +MISC metadata.xml 503 RMD160 0f641957a0be2d29856054f869954096b9c23bf8 SHA1 9b49561ee779e790583979a0d91e6a85240b7090 SHA256 8ef221ee2c2aaa8a80bc9cb53a2d9208e44e4e4af0e1585d51728272b658dcd3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk9LFmwACgkQC77qH+pIQ6SVhgEAumxG+L+zQWIDJEHKHmZEiGKT -6eOtV1nUqF55XD7MLRABAL07YfQfRHo5I+B2hZUMa/BLnmdrh1vtXCHTsHUUL09+ -=dGUe +iF4EAREIAAYFAk9NcXUACgkQC77qH+pIQ6QqVgEAuI/6BRTBACm5T8VZelvIGUDF +aPt1a/iYoJi/DyJqUecA/jKj+O8nvMSbOzq1I1auHmgZf1ivPICxyn1do7dl7wbT +=eDLg -----END PGP SIGNATURE----- diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml index 70466d54f57d..93137d2837e1 100644 --- a/sys-fs/zfs/metadata.xml +++ b/sys-fs/zfs/metadata.xml @@ -10,4 +10,8 @@ <email>floppym@gentoo.org</email> <name>Mike Gilbert</name> </maintainer> + <use> + <flag name="dracut">Install dracut module</flag> + <flag name="test-suite">Install regression test suite</flag> + </use> </pkgmetadata> diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 0d5bba859b01..a2028a761721 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-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-fs/zfs/zfs-9999.ebuild,v 1.13 2012/02/27 05:36:38 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.14 2012/02/29 00:29:35 floppym Exp $ EAPI="4" @@ -14,7 +14,7 @@ EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git" LICENSE="CDDL GPL-2" SLOT="0" KEYWORDS="" -IUSE="custom-cflags debug static-libs" +IUSE="custom-cflags debug dracut test-suite static-libs" DEPEND=" >=sys-kernel/spl-${PV} @@ -23,6 +23,16 @@ DEPEND=" " RDEPEND="${DEPEND} !sys-fs/zfs-fuse + sys-fs/udev + test-suite? ( + sys-apps/gawk + sys-apps/util-linux + sys-block/parted + sys-fs/lsscsi + sys-fs/mdadm + sys-process/procps + virtual/modutils + ) " DEPEND+=" test? ( sys-fs/mdadm ) @@ -41,11 +51,14 @@ pkg_setup() { BLK_DEV_LOOP" kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" check_extra_config + use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports." } src_prepare() { # Workaround for hard coded path sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die + # Workaround rename + sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die autotools-utils_src_prepare } @@ -77,4 +90,6 @@ src_test() { src_install() { autotools-utils_src_install gen_usr_ldscript -a uutil nvpair zpool zfs + use dracut || rm -rf "${ED}usr/share/dracut" + use test-suite || rm -rf "${ED}usr/libexec" } |