Introduce bash-completion USE flag, fix test-suite and dracut USE flags, correct description for rootfs USE flag and improve zfs OpenRC script for systems with a ZFS rootfs.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

5 files changed, 215 insertions, 17 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 5d2fa64a558d..e3e7d7f1e452 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.63 2013/03/28 22:19:57 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.64 2013/05/29 00:39:51 ryao Exp $
+
+*zfs-0.6.1-r1 (29 May 2013)
+
+  29 May 2013; Richard Yao <ryao@gentoo.org>
+  +files/zfs-0.6.1-gentoo-openrc-dependencies.patch, +zfs-0.6.1-r1.ebuild,
+  metadata.xml:
+  Introduce bash-completion USE flag, fix test-suite and dracut USE flags,
+  correct description for rootfs USE flag and improve zfs OpenRC script for
+  systems with a ZFS rootfs.
 
 *zfs-0.6.1 (28 Mar 2013)
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 6f2f6a4e6321..a75c22fb210c 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831 SHA512 e7ccb7179c4c455c496daab192099d7553674b9505801e25a2ea8c67a1b4de15d68ac99b2c3347c1f3454f88ede7694f08da61c5d061f0577bb1594ca4a90f12 WHIRLPOOL 79dfdc9c80a707f6bb39bea51ec451c16b821886ce3e84c73a249313d991cf8019f0647b0fe439754fc1ad08cb294bf4c245955fdc4af30286a8afd61dba21ba
 AUX zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch 1159 SHA256 bd40a60408772cfe789bd0f055906cd2aebf43761adb2cb19ca6219c92c5f996 SHA512 aba0ee09e0070ee7472ffeb0274fdac1870e6a11390c110e9febd7240eb8465351355ce6b735d3f0a6ce2ce5bd167a4239ececc3dae33899df3b4f72c162f037 WHIRLPOOL 72635866ef46b592d257071d4902d36b95855850e40de0b6a6afc6ad416460ebdc5b2ece67d011a052895ab6ae9135d77622f7fb15f4cc0f3a6b96df6c2581d2
+AUX zfs-0.6.1-gentoo-openrc-dependencies.patch 2416 SHA256 01b4def8e15eb8854d87529d4540b7b85c927b64e81112cecf13a5aa30c1bc31 SHA512 d4012fb14f3c599d763b6412c092b95d76297afd4d65b71a602485357505aa1fbdc7f5ad437b5634365311349f1a29adcc1dd0e7d20cb85802ce58c0dd393d3c WHIRLPOOL 9c4e3ece9773efc5ec99f9a453eca4656d8e64ac47735878313cddbae8a64ba34503c4a3dd206e658c47f1b9360d545e497838e455af90b87ae4a935d28172f6
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
 DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de443103d73db315b4f328c296cd6a073 SHA512 4bd2fc3cd5eb89f64b7b92a16e416edb245b0a9b90b5e1aa3bd1560c7d568322de03fdb40ede2d8417b0b642bbf70a1e804d51e4537babbfa9c767271b701138 WHIRLPOOL c56034028fd7c21f516ceb268cc25eeedd129a2a7cb8c1615f43982a86bb4400e80ab74159c4fc5d24a79610e2c0935f54cbc33c447751f29cecec882bfef89e
 DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c1501f0159c80a1b1ff961b6f137d6 SHA512 55f0d9ea9f085d78a4929250949449ec4329a71c00ecd6fe76322716b64dc1152d93a23bb8b18e4ba7e1fbd6110b170366763f730c1e5006998aee3870e3635e WHIRLPOOL ea8fbe2edb2e0029affed261916d10ef350129c496b71064d34749b805d83c1531d886a55802839bb4226e298719f708f6816ee5411626b431b1d506bbf10232
@@ -14,24 +15,25 @@ EBUILD zfs-0.6.0_rc11-r3.ebuild 2425 SHA256 91c81e66eb4cb7362810bc748d1cb05b2d51
 EBUILD zfs-0.6.0_rc12-r3.ebuild 2425 SHA256 7ae28e9025453f623fdfddccbaba6d4f56448da1837df30fd4102babe853ae3c SHA512 d33c48ab59528413ffdba58aaaed0022d19a33cd402731c32ddf89ec043fb1552d57cc5a74d2c4efdc9bc2aa25140846c3ee1c80cf3b9d9f098cb54816d0e3ae WHIRLPOOL 59634e47aa9824b1397ea374433309928a71074d1cc7b415ff1fd125696cc8404e15e1f59091ec74acdab749a2a48b86cd0c3ff053dc70a12c6998b21c789eff
 EBUILD zfs-0.6.0_rc13-r2.ebuild 2767 SHA256 a01f304e92fd0fdb0c2d61d2924948a8184a31d6ff300d0b95cf10fdde20c4b7 SHA512 0c5280577004b38eab50beaa86d621e06eac648e7b5f9ba0af7e3522c9ea1ea9e12cb0ab4cf0a918c59bf919c9596ea23716be639a86a6bbc4ce3151d3cef744 WHIRLPOOL af66f26c293b926e52f729ef11fd5ac218c8a6ef78a73525a945fc843f9de2735ac65032a9a0c1a7b35f6d5bd083751c52e3301949212c2e284f67ef1afa33b7
 EBUILD zfs-0.6.0_rc14-r1.ebuild 2898 SHA256 94eec2441edd8094dad6bb73a576198fcb5c3221de9e4cff13193f86906897a3 SHA512 e948a46ab4560754896044411fb51b1188e601dca4cd9de56022b72ee6d8c942329813e71a9dadb9c9665d203c5d8dd04c1f9071472950eaead78898ed5826f1 WHIRLPOOL 84080714d51b18a663812115c16eb734f71ab2f02d5138a30dcc660a361caa198021ae46b744c35edd8b78edfcc3f9a2b5ece8fdf68b2ac26dae199eb76028a3
+EBUILD zfs-0.6.1-r1.ebuild 2953 SHA256 34ea22f5dabed1c2fc91a9abd584f2c8a4f3d4cec107666fd9ed1bc2542ef2f9 SHA512 0fb005f42643061537569637b54b2c8d0d7fc561f630f328055a85e2dfa421d2875c28d3aaef2fc7cba05c78a640c27a2326e8e344b78e56ca3fae32b0cbe6d5 WHIRLPOOL 6eae2135510f68bb7443471461f1c57995309a381c7939516e7367ec4c9561bc70cf746aa8f6842f377a9209c72baf8558c0e42ef36c87e0f5d3c66e74f749ca
 EBUILD zfs-0.6.1.ebuild 2787 SHA256 0d14acc8d1e636d2ef2135f49c48699a906767518402c5b899e61fcb8c06f77e SHA512 f32c75e8f29597015bb84c9b86e4afc59050fdd864dadcf73f7e033748bfe1fd8d571082688ae842d580bcdf61806c4a7896b22e8ccc035ac1caba1ff24fdc7d WHIRLPOOL fb20aa638bae357562c01e6aef319ccea970753c9148a36a484a5c252e9b1c905db10461a0e9d1ef217a6ac9f2989dcc090814359f593cc4f7d8e8228de1baa5
 EBUILD zfs-9999.ebuild 2890 SHA256 58335fa7bb966fcdafa0d770ba91b24de7ec8994dc6e355c64eb8fdfdd6cbe9b SHA512 e728d7e973cd30e561c6bf8af12a3c6fa51beac390ea22e318b960e76384b919c2e7d4ac98e43aa03ca3c999855ebfe0fe40e428921577b51d566de74bb70e82 WHIRLPOOL f26761c1f0bb6c6885ee296a748bfe2cc2d1fbae5c39a64f3b329b92b3250a42f8f29479b86fd7267a35516a1528d2211be1a2c7389423e85b066f6101547cca
-MISC ChangeLog 12295 SHA256 edc6aca6c3d59ae49afdb32d454e27f15e1a3d212c0543d620927521127788e6 SHA512 08e65b73428c941c276bceaff4d84057ff722fad2eeb4afa04f5063499b0280882c65717caf5004e8ed13c38e84204b0714e90d3029b3f9bf78d565692e53dda WHIRLPOOL 6361734b9c9c3e62c825ad03df90bf0698e6b7d593e9ba0aec82a3571d8093f2bc5a28b2ed17b8c1c7ec447bdc5110c13de4dbbf3fcdfedf22bfa21e7f819ad5
-MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
+MISC ChangeLog 12641 SHA256 fc4c2bb7eec00ffd9f0de768317513e06252e88f75a549e583b38d397a7398fc SHA512 5771dbabf2402fb3357a5a059bc98172d65c2044674cd19b3d81aebaa3a77cf74f11722b62e0bf8f9a9446955cbe218026a9055cd002d172cb7dc4c238df2586 WHIRLPOOL e4c772851cde7c23508b59b0f811d010f8f8de3c057219814d78ffa935502d2aafdbe70f504c087644f341a883aff484e799853af124a54bcc354970bffd6b8d
+MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRVMH6AAoJECDuEZm+6ExkPxEP/28sJ6VkNTmb+20lfubSpvW0
-Ygz6oGyObxoIcQZk2JqhnxCVM7PGojUarNh9mRwazhnVRJcPo0c5+Fvsn9s8Xh8v
-D5g0DwcwHo4lOXTydIfZg82vcKTFSn6HVB4miBspNJRRXRzAHLhbnlY/EE7vaJHc
-E0aaWnp5ni+XuuTT9OG4TSavKx7W1Y7SEq0gVIbwt9UFtkXkw7UR1zlNpmGD+2/O
-nrP7VqAwd4OhPOvAfS4Of2PLp/GFvJWNuhEx7daaZgw3fgPUirCKwD3P/KHuYKRb
-71eVSGxeYRa6MUjf3VzGxuJrOC5aDiRiR6dIh0u5MXIl3rXYhrUYCf8vwCWEpvlK
-i5u33WPXAPaonqP0QhtasVp772O2exJGyu9keh2XI0yI2oZNupo+nzBh+BqQkKiI
-qcDWNK+j78xpi3jSaa0xpNpQZNyZYzDbFGewhMw9eBW32L8D24s2LO21iX192p6V
-lLL7HBep5p565JbsfKZteJxxgwDfGBPvgDt8iJhg8yHVN8NuHyAhTXqPY+766JLs
-4z+/0tRKQF30Opix0rHIXxKZlskgrd9AnnpSNg3jRrbPr5X0O0S1sAI2tGvTEAQy
-Few6WfQu9FOjXUMcP6wmopfVthQQLoLY5v42QSBKL6/mQtQvICeOluUle2gFiBWH
-KjdbveW8GL9Gl+tHVlRP
-=C3nu
+iQIcBAEBCAAGBQJRpU44AAoJECDuEZm+6ExknK8QAJcv26RF9aZmMdfShwX97e1T
+/CLiXUESVruFlhq/6YVnzLkI31COJ/O2uCOcq8AEeWXgnIRwf/wRmuyEU6q6mH7C
+lH7iwPHBNAbbpsibjCrxYjGIx/PnjQ3N3M6sLtNgsQbtvDXuWqkP1k+DHQ3PY8So
+9NoQQjIhuhnVK0uPaa5AqnA5IicwLbPo0R7ELOD4gk2w7pcUHvt2jSEmiZ/xmB+5
+3Hc4HyQUkFPloegRvxuYm4TnitLWujS3VkZtSaXm5LpB0+x0d4xvgDwlQuJAHcbM
+FQ6p4eeYhu0BX9CcPk6SvbSA8VwW6/kTzPPs+DZ0jtJDzxxt+aA5TGVnBcSnEzLd
+6rZ6xLDXSzBSzCHoTEuHa01ZyewAz6lBbmB7caC/zINoqIh1p0V9L1DosKF7BPaL
+lu1AtiTqghl7ChYIz9n1RRGoBrUOH6Yr7LOZpXmV5U0083HgDaNpkYn4Oz/u8v/y
+xCBYCaQpGFxZwt25NHKEchsvCyiK6WOG9mJBWVc21Kn8cEpn9cvvGKed2hYuVBv1
+VuOIvtuKncKYgmGFV/1pcqeVyyoy8TGjP48sUOaxMFKSomAiI441mxGNCjCwAcdw
+S8j8pztpmBL7DTkiPGD9IzBdg5ZjlhOICjUsme+3n0Vkoz2Ejx2cB5KnBCzs/dyh
+YfBbiVDAiuKlmWD50kEQ
+=W91M
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch b/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch
new file mode 100644
index 000000000000..e794b183eb33
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch
@@ -0,0 +1,57 @@
+commit 75c2fb953c99bba008f1ef72ee71136002749f51
+Author: Richard Yao <ryao@cs.stonybrook.edu>
+Date:   Tue May 28 20:08:15 2013 -0400
+
+    Improve OpenRC init script
+    
+    The current zfs OpenRC script's dependencies cause OpenRC to attempt to
+    unmount ZFS filesystems at shutdown while things were still using them,
+    which would fail. This is a cosmetic issue, but it should still be
+    addressed. It probably does not affect systems where the rootfs is a
+    legacy filesystem, but any system with the rootfs on ZFS needs to run
+    the ZFS init script after the system is ready to shutdown filesystems.
+    
+    OpenRC's shutdown process occurs in the reverse order of the startup
+    process. Therefore running the ZFS shutdown procedure after filesystems
+    are ready to be unmounted requires running the startup procedure before
+    fstab. This patch changes the dependencies of the script to expliclty
+    run before fstab at boot when the rootfs is ZFS and to run after fstab
+    at boot whenever the rootfs is not ZFS. This should cover most use
+    cases.
+    
+    The only cases not covered well by this are systems with legacy
+    root filesystems where people want to configure fstab to mount a non-ZFS
+    filesystem off a zvol and possibly also systems whose pools are stored
+    on network block devices. The former requires that the ZFS script run
+    before fstab, which could cause ZFS datasets to mount too early and
+    appear under the fstab mount points. The latter requires that the ZFS
+    script run after networking starts, which precludes the ability to store
+    any system information on ZFS. An additional OpenRC script could be
+    written to handle non-root pools on network block devices, but that will
+    depend on user demand and developer time.
+    
+    Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
+
+diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in
+index 5b8671e..0034e02 100644
+--- a/etc/init.d/zfs.gentoo.in
++++ b/etc/init.d/zfs.gentoo.in
+@@ -10,9 +10,16 @@ fi
+ 
+ depend()
+ {
++	# Try to allow people to mix and match fstab with ZFS in a way that makes sense.
++	if [ "$(mountinfo -s /)" = 'zfs' ]
++	then
++		before localmount
++	else
++		after localmount
++	fi
++
+ 	# bootmisc will log to /var which may be a different zfs than root.
+-	before net bootmisc
+-	after udev localmount
++	before bootmisc logger
+ 	keyword -lxc -openvz -prefix -vserver
+ }
+ 
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index 4b0c992ad1fd..767507ca9900 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="kernel-builtin">Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree</flag>
-		<flag name="rootfs">Install zfs-shutdown script to support exporting a pool containing rootfs</flag>
+		<flag name="rootfs">Enable dependencies required for booting off a pool containing a rootfs</flag>
 		<flag name="test-suite">Install regression test suite</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/zfs/zfs-0.6.1-r1.ebuild b/sys-fs/zfs/zfs-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..ce837dc77d3a
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.1-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.1-r1.ebuild,v 1.1 2013/05/29 00:39:51 ryao Exp $
+
+EAPI="4"
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-2 linux-mod
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	inherit eutils versionator
+	MY_PV=$(replace_version_separator 3 '-')
+	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="bash-completion custom-cflags kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		)
+"
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	if [ ${PV} != "9999" ]
+	then
+		# Fix OpenRC dependencies
+		epatch "${FILESDIR}/${P}-gentoo-openrc-dependencies.patch"
+	fi
+
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(udev_get_udevdir)"
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs
+	rm -rf "${ED}usr/lib/dracut"
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	use bash-completion && newbashcomp "${FILESDIR}/bash-completion" zfs
+
+}
+
+pkg_postinst() {
+
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
+		|| ewarn 'You should add zfs to the boot runlevel.'
+
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		remove_moduledb
+	fi
+}