diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-04-04 00:21:49 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-04-04 00:21:49 +0000 |
| commit | 75e4db193fef8d810e5b91b218be44797147a27f (patch) | |
| tree | 8527c7da48286f7e0edb6b358151784cfcd8ee43 /sys-fs | |
| parent | Implement fix for ZFSOnLinux upstream issue #631 and make improvements toward... (diff) | |
| download | historical-75e4db193fef8d810e5b91b218be44797147a27f.tar.gz historical-75e4db193fef8d810e5b91b218be44797147a27f.tar.bz2 historical-75e4db193fef8d810e5b91b218be44797147a27f.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-fs')
| -rw-r--r-- | sys-fs/zfs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/zfs/Manifest | 14 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 13 |
3 files changed, 24 insertions, 9 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog index a0df6e8f62d6..1b7dd1cba2e3 100644 --- a/sys-fs/zfs/ChangeLog +++ b/sys-fs/zfs/ChangeLog @@ -1,6 +1,10 @@ # 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.14 2012/02/29 00:29:35 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.15 2012/04/04 00:21:49 floppym Exp $ + + 04 Apr 2012; Mike Gilbert <floppym@gentoo.org> zfs-9999.ebuild: + Implement fix for ZFSOnLinux upstream issue #631 and make improvements toward + prefix support. Patch by Richard Yao. 29 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml, zfs-9999.ebuild: Update from Richard: Add missing dependencies, introduce USE flags to permit diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index f228893b5536..eb2e806194fe 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,3 +1,13 @@ -EBUILD zfs-9999.ebuild 2149 RMD160 3cb02238bd2cc37492482a1135487744e9c28f25 SHA1 9ae61b9084cfe68cfc235e4c0e23f768825eaa8a SHA256 ca9eb8acc3dd6a0bf74a154aca58738f527b75db581c2fa53576421970640dd6 -MISC ChangeLog 2111 RMD160 ac709bd7f414113425a232ce7894ae75805774b0 SHA1 0edd82681eba50050e06478255b994e023bf66f7 SHA256 fbbb1721d81b7a3e1a5659d7b4cd21a666532f13e25e59c50afbe2481a17862f +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +EBUILD zfs-9999.ebuild 2211 RMD160 973c831b79c102e70f10c2c32e1036468886f001 SHA1 c1783bd230dea0fb8c4cd418e1ea0d8679ed6184 SHA256 ffae9e2a6b368a059bca6950c80678b2d97af92824147bf80aeb4ff4c8605d9c +MISC ChangeLog 2298 RMD160 7b2b90cc23ffe2a1a04e3e6e6152bd544bd7eb3d SHA1 2dd4f108e9b64d9fe3ac16d86fbfe308973c75a6 SHA256 4bdadd19995553977ec7690eb1da6a3992ad34b1ba9c9cd1a906fef9aee6d2b7 MISC metadata.xml 503 RMD160 0f641957a0be2d29856054f869954096b9c23bf8 SHA1 9b49561ee779e790583979a0d91e6a85240b7090 SHA256 8ef221ee2c2aaa8a80bc9cb53a2d9208e44e4e4af0e1585d51728272b658dcd3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk97lCMACgkQC77qH+pIQ6SF3QD/aOVfR50J/gFEhr3YZtCYrdNg +8sGJIgeRHArk+e4c4LoBAMbR8VZQRfqNxYGJ8vRVEvZbCnYObSCAZrpQSsSEYQ1F +=C3ES +-----END PGP SIGNATURE----- diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 92de4f62ee10..7e02f50dc7cd 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.15 2012/03/04 19:46:38 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.16 2012/04/04 00:21:49 floppym Exp $ EAPI="4" @@ -23,7 +23,7 @@ DEPEND=" " RDEPEND="${DEPEND} !sys-fs/zfs-fuse - sys-fs/udev + !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux @@ -45,13 +45,14 @@ AUTOTOOLS_IN_SOURCE_BUILD="1" pkg_setup() { CONFIG_CHECK="MODULES !PREEMPT + !PREEMPT_VOLUNTARY !DEBUG_LOCK_ALLOC ZLIB_DEFLATE ZLIB_INFLATE 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." + use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports." } src_prepare() { @@ -66,12 +67,12 @@ 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}" - --with-udevdir=/lib/udev + --with-udevdir=${EPREFIX}/lib/udev $(use_enable debug) ) autotools-utils_src_configure |