added live ebuild to zfs-fuse

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

7 files changed, 184 insertions, 12 deletions

diff --git a/sys-fs/zfs-fuse/ChangeLog b/sys-fs/zfs-fuse/ChangeLog
index 298fd5fbacb8..c7131ce25917 100644
--- a/sys-fs/zfs-fuse/ChangeLog
+++ b/sys-fs/zfs-fuse/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/zfs-fuse
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.4 2008/02/13 07:51:17 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.5 2008/09/25 14:32:16 trapni Exp $
+
+*zfs-fuse-9999 (25 Sep 2008)
+
+  25 Sep 2008; Christian Parpart <trapni@gentoo.org>
+  +files/9999/fix_zdb_path.patch, +files/9999/fix_zfs-fuse_path.patch,
+  +files/9999/fix_ztest_path.patch, +files/9999/zfs-fuse.rc,
+  +zfs-fuse-9999.ebuild:
+  added live ebuild to zfs-fuse
 
   13 Feb 2008; Christian Faulhammer <opfer@gentoo.org> metadata.xml:
   add no-herd
diff --git a/sys-fs/zfs-fuse/Manifest b/sys-fs/zfs-fuse/Manifest
index 87ffcb8e4a0f..ce6cbd412e85 100644
--- a/sys-fs/zfs-fuse/Manifest
+++ b/sys-fs/zfs-fuse/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 9999/fix_zdb_path.patch 483 RMD160 e212d2a3b69e75a3fe7ee8085763d681b9058270 SHA1 1e78f4f8b4286626642d8393d3f75d0689f47f50 SHA256 d4cef9ffd277c699360a7f8a1b25503a89d661ecc8285f80ca1e8cc30172ee84
+AUX 9999/fix_zfs-fuse_path.patch 378 RMD160 9f1f1692e5fbbc6ea29c7a5d7284bc75593bc3a4 SHA1 f49abfca781065a21259cae422bcf7149e169040 SHA256 42df1294e8801330f848261024d29b2e8f51b860527629a010b00b1ea89f7dd4
+AUX 9999/fix_ztest_path.patch 458 RMD160 085918e132c4103b3ac2c4208d4d915b8b423622 SHA1 9fb7685ed350b8aac86484d51d6bb8ccf8473a92 SHA256 d6b69995ea21ef2f556ff330f0bf25734445341b8f2b6f51ae68ce19e22ec9c8
+AUX 9999/zfs-fuse.rc 907 RMD160 8f4327d83e2e91929867b006c5ef7385063db09b SHA1 308ce937f3e7c6f4c9585a3d377407c3248b75e4 SHA256 8e022ad8eed575bc203aaffdfcc5ba976851fb0f669f1b00e313fe0b5ed07d59
 AUX zfs-fuse-0.4.0_beta1-fix_zdb_path.patch 510 RMD160 7a20f11836d11dc131a1e5227c8b8e66cdfa8f2d SHA1 39645ff69b525d1b177bd890d58730f23c5774fa SHA256 9764181601d95d58d857d99754d28bdaa919bd46ad4e8381d72a3c96414d967d
 AUX zfs-fuse-0.4.0_beta1-fix_zfs-fuse_path.patch 366 RMD160 c9a877d85a9baf48cd46ca6e48bd88ef693275f6 SHA1 27d1589c18b28dfc53c4d2297248e6389413fb57 SHA256 f9917fffcbfb75cda3adcb51d08779fa6e59ad174007fd5069b65d2976935917
 AUX zfs-fuse-0.4.0_beta1-fix_ztest_path.patch 458 RMD160 085918e132c4103b3ac2c4208d4d915b8b423622 SHA1 9fb7685ed350b8aac86484d51d6bb8ccf8473a92 SHA256 d6b69995ea21ef2f556ff330f0bf25734445341b8f2b6f51ae68ce19e22ec9c8
@@ -10,12 +11,6 @@ DIST zfs-fuse-0.4.0_beta1.tar.bz2 606593 RMD160 93c4aea550f3b55d39c2657f90e863ab
 EBUILD zfs-fuse-0.4.0_beta1-r1.ebuild 2465 RMD160 9bcbc1a35c5b0bee59c5c4895e404653b9138552 SHA1 5be260042cf1f1389a809a31bfa848dc96d227cc SHA256 fa69522e8556ce68354aba5293922ca9c7919f6f83d2e57c80adfab596e82719
 EBUILD zfs-fuse-0.4.0_beta1-r2.ebuild 2487 RMD160 5a431138933213e45dfa8e93ee77877f7df204c7 SHA1 80d12ec5e7ce99d641ffcf2351c5f392fef9fbbf SHA256 cbf4130e75520b5ee892f49f93bbb960a7b1e39f801982fd300301c30268ea79
 EBUILD zfs-fuse-0.4.0_beta1.ebuild 2484 RMD160 0b0bc4f109f8851ef57b4bb053178e97e5789308 SHA1 7b2c7e529dd723ab070a04f6a6b382f44f308119 SHA256 913835c0843117413f1ca41abd384ef4828c83d32010b86ba35e11cd4c5f4111
-MISC ChangeLog 765 RMD160 0eb01368fd6eea6bb42f27b6803b3b9b91cf0eef SHA1 0ce2499f607a4b46ffe70089bc900f4c4bcd61fc SHA256 2d37dde1af9265426de99b46b0f05f1ef7e05dc25ae69e3ac35aa9ebcf614bd2
+EBUILD zfs-fuse-9999.ebuild 2496 RMD160 5e3632414d95fc16dcb42750d031542710046dba SHA1 1e71c063738363a92cff1a3fa4e4282cf87a4cc2 SHA256 0fe1f2f5c2bda374702f04d7edfcd2cabfaccd80b3e92bdbefa426a5799207d9
+MISC ChangeLog 1039 RMD160 b07ce9aa4ecc9c3527be28f7d503c683e620837a SHA1 31f6ffea47668bd31646b640b1bd01e310511a57 SHA256 bdf258d6c255b77fc2823e76af8181352d959f8563e62756486f1fc3be9bd3b3
 MISC metadata.xml 220 RMD160 ba793b36fde5acec86d8150ceddf4f3cfb5c2ae9 SHA1 6eb5af4c500c3736062744a87af40484a47e6951 SHA256 9375701257b18e240ba4baf120f7ee473798d867728c9c3fdc50b3b305df7ded
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHsqHNNQqtfCuFneMRAixRAJ4yNCH+JG0Jy0kI6gn7ftKyd9lWCACdHcLD
-Bgbho68HJCkD/V3V/AHKc1s=
-=91Xb
------END PGP SIGNATURE-----
diff --git a/sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch b/sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch
new file mode 100644
index 000000000000..770c1ae9dcf3
--- /dev/null
+++ b/sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch
@@ -0,0 +1,11 @@
+--- a/src/cmd/ztest/ztest.c	2008-06-24 13:52:22.000000000 -0400
++++ b/src/cmd/ztest/ztest.c	2008-06-24 14:59:06.000000000 -0400
+@@ -2844,7 +2844,7 @@
+ 	/* zfs-fuse: ztest is never installed, so zdb should be in ../zdb/ */
+ 	/* LINTED */
+ 	(void) sprintf(zdb,
+-	    "../zdb/zdb -bc%s%s -U /tmp/zpool.cache -O %s %s",
++	    "/usr/sbin/zdb -bc%s%s -U -O %s %s",
+ 	    zopt_verbose >= 3 ? "s" : "",
+ 	    zopt_verbose >= 4 ? "v" : "",
+ 	    ztest_random(2) == 0 ? "pre" : "post", pool);
diff --git a/sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch b/sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch
new file mode 100644
index 000000000000..3b5d656f5744
--- /dev/null
+++ b/sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch
@@ -0,0 +1,13 @@
+--- a/src/zfs-fuse/run.sh	2007-01-09 11:07:35.000000000 +0000
++++ b/src/zfs-fuse/run.sh	2007-01-09 11:45:05.000000000 +0000
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+-
++echo ""
++echo "On Gentoo ZFS-FUSE runs in debugging mode by default."
++echo "To run ZFS-FUSE without debugging please run /usr/bin/run-zfs-fuse"
+ ulimit -c unlimited
+-
+-./zfs-fuse --no-daemon
++echo ""
++/usr/bin/run-zfs-fuse
diff --git a/sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch b/sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch
new file mode 100644
index 000000000000..d87979d4391c
--- /dev/null
+++ b/sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch
@@ -0,0 +1,9 @@
+--- a/src/cmd/ztest/runtest.sh	2007-01-09 11:07:35.000000000 +0000
++++ b/src/cmd/ztest/runtest.sh	2007-01-09 11:08:51.000000000 +0000
+@@ -3,5 +3,5 @@ ulimit -c unlimited
+ echo "Start date: `date`"
+ #ZFS_DEBUG=on /usr/bin/time -v nice -n 20 ./ztest -V -T 86400 &> log.txt
+ #/usr/bin/time -v nice -n 20 ./ztest -V -T 86400
+-nice -n 20 ./ztest -V $* && echo Test successful
++nice -n 20 /usr/sbin/run-ztest -V $* && echo Test successful
+ echo "End date: `date`"
diff --git a/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc b/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc
new file mode 100644
index 000000000000..f88c73e21dee
--- /dev/null
+++ b/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc,v 1.1 2008/09/25 14:32:17 trapni Exp $
+
+depend() {
+	need localmount
+	before net
+}
+
+PIDFILE="/var/run/zfs-fuse.pid"
+EXEFILE="/usr/sbin/zfs-fuse"
+
+checksystem() {
+	return 0 # TODO
+}
+
+start() {
+	ebegin "Starting ZFS-FUSE"
+	checksystem || return 1
+	start-stop-daemon --start --exec ${EXEFILE} \
+        	--pidfile ${PIDFILE} --user daemon --group disk
+	rv=$?
+	eend $rv
+
+	if [[ $rv -eq 0 ]]; then
+		ebegin "Mounting ZFS filesystems"
+		zfs mount -a
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Unmounting ZFS filesystems"
+	zfs umount -f -a
+	eend $?
+
+	ebegin "Stopping ZFS-FUSE"
+	checksystem || return 2
+	start-stop-daemon --stop --pidfile ${PIDFILE} \
+		--exec ${EXEFILE} --retry TERM/1/TERM/2/TERM/4/TERM/8/KILL
+	eend $?
+}
diff --git a/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild b/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild
new file mode 100644
index 000000000000..f490e3f64e9b
--- /dev/null
+++ b/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild,v 1.1 2008/09/25 14:32:16 trapni Exp $
+
+IUSE="doc debug"
+
+inherit eutils mercurial
+
+DESCRIPTION="An implementation of the ZFS filesystem for FUSE/Linux"
+HOMEPAGE="http://www.wizy.org/wiki/ZFS_on_FUSE"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=sys-libs/glibc-2.3.3
+		>=dev-util/scons-0.96.1
+		>=dev-libs/libaio-0.3
+		>=sys-fs/fuse-2.6.1"
+
+RDEPEND=">=sys-fs/fuse-2.6.1"
+
+S=${WORKDIR}/trunk/src
+
+src_unpack() {
+	mercurial_fetch http://www.wizy.org/mercurial/zfs-fuse/trunk
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}/fix_zdb_path.patch"
+	epatch "${FILESDIR}/${PV}/fix_zfs-fuse_path.patch"
+	epatch "${FILESDIR}/${PV}/fix_ztest_path.patch"
+}
+
+src_compile() {
+	scons || die "Make failed"
+}
+
+src_install() {
+	if useq debug; then
+		mv cmd/ztest/ztest cmd/ztest/run-ztest || die
+		mv cmd/ztest/runtest.sh cmd/ztest/ztest || die
+		dosbin cmd/ztest/run-ztest || die
+	fi
+	dosbin cmd/ztest/ztest || die
+
+	if useq debug; then
+		mv zfs-fuse/zfs-fuse zfs-fuse/run-zfs-fuse || die
+		mv zfs-fuse/run.sh zfs-fuse/zfs-fuse || die
+		dobin zfs-fuse/run-zfs-fuse || die
+	fi
+	dosbin "zfs-fuse/zfs-fuse" || die
+
+	dosbin "cmd/zfs/zfs" || die
+	dosbin "cmd/zpool/zpool" || die
+	dosbin "cmd/zdb/zdb" || die
+
+	newinitd "${FILESDIR}/${PV}/${PN}.rc" "zfs-fuse" || die
+
+	cd "${WORKDIR}/trunk" || die
+
+	dodoc CHANGES || die
+
+	if use doc; then
+		dodoc {INSTALL,TODO,STATUS,TESTING,HACKING,BUGS} || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "To debug and play with ZFS-FUSE make sure you have a recent 2.6.xx"
+	einfo "series kernel with the FUSE module compiled in OR built as a"
+	einfo "kernel module."
+	einfo
+	einfo "You can start the ZFS-FUSE daemon by running"
+	einfo
+	einfo "     /etc/init.d/zfs-fuse start"
+	einfo
+	einfo "as root from the command line. "
+	einfo
+	einfo "And don't forget to add it permanently, if you want to:"
+	einfo
+	einfo "    rc-update add zfs-fuse boot"
+	einfo
+	einfo "For additional ZFS related commands I recommend the ZFS admin"
+	einfo "guide. http://opensolaris.org/os/community/zfs/docs/zfsadmin.pdf"
+	einfo
+	einfo "Don't forget this is an beta-quality release. Testing has been"
+	einfo "very limited so please make sure you backup any important data."
+	einfo
+	einfo "If you have any problems with zfs-fuse please visit the ZFS-FUSE."
+	einfo "website at http://developer.berlios.de/projects/zfs-fuse/"
+	echo
+}