Fix 32-bit compiler warnings and remove push page patch in favor of change to sys-fs/spl

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 202 insertions, 2 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 960f2669a672..a0ffa05152a9 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2012/07/01 13:03:28 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.35 2012/07/10 00:31:39 ryao Exp $
+
+*zfs-0.6.0_rc9-r4 (10 Jul 2012)
+
+  10 Jul 2012; Richard Yao <ryao@gentoo.org>
+  +files/zfs-0.6.0_rc9-fix-32-bit-warnings.patch, +zfs-0.6.0_rc9-r4.ebuild:
+  Fix 32-bit compiler warnings and remove push page patch in favor of change to
+  sys-fs/spl
 
   01 Jul 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9-r3.ebuild,
   zfs-0.6.0_rc9.ebuild, zfs-9999.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 6319d902107f..2d7592cfaed6 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,6 @@
 AUX bash-completion 6203 RMD160 3103cb50030ae3f3674608e516bab2dc9eda1184 SHA1 1ceb2c164e3f168a9e80c8dc4c396b8233e76fec SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831
 AUX linuxrc 225 RMD160 5d5471867fe8b6b93ae6391c04f23ed27dcfccbf SHA1 6e68b01e66543ad7e1f182596de6fc0aeeab2744 SHA256 69c5f407ae20a5e3000dc6389f8c75ee97e11c353489a00cb619134b103bf538
+AUX zfs-0.6.0_rc9-fix-32-bit-warnings.patch 1437 RMD160 b3b6edc86bb275380bdfc6a719c82bf159abdfa5 SHA1 2728377900f02f36fc17bb574f4ab867490f8316 SHA256 4c20e471fa9431d38af870b0f39dd17e46d90ac246f33e7bfa88218c59cbb461
 AUX zfs-0.6.0_rc9-hardened-support.patch 10487 RMD160 7691c3acacc7300a807ce34748d54b5c701d2d1f SHA1 fdfb1daa4358dabd2d470e3b2a40587574ac4a48 SHA256 5a2d1aa5c7b14446e889041ce50b9dbd74c0626f257cb14514230ab9618d48d9
 AUX zfs-0.6.0_rc9-range-lock-caller-allocate.patch 16938 RMD160 0d8d2b160fae59c3e65941727984ff1d696f2719 SHA1 99debe5367008b0a8bf453cdcf6bad5a4dbcfec4 SHA256 54281bc439f459fa2ef1d057d8d13cc4017de2100edb8b56229959644881d22c
 AUX zfs-0.6.0_rc9-remove-pfmalloc-1-of-3.patch 1438 RMD160 750c62bac1206044a3819764409887204c70990f SHA1 f6e7d252507e76c36083b4a504d74dbff1a4fd12 SHA256 d1f1b3f47e0ada27e43ac04576eb61a96b5abe3bc6a7bd7869fe72e1e08bb4df
@@ -9,7 +10,8 @@ AUX zfs-0.6.0_rc9-use-pushpage.patch 38878 RMD160 16c6fd5ddbcba2961be21a1a640fcd
 AUX zfs-shutdown 1252 RMD160 449ba23e29486255bd04d54dfe11b77d414ba6d4 SHA1 108d271dfbe86df47f50a3219c5cf839efe4ce92 SHA256 cba63ddf086044c7e041c296ea86f68a1579ac830b8bea56b9f74b4204f96553
 DIST zfs-0.6.0-rc9.tar.gz 1989469 RMD160 fef1e4e4f0d122be60e3f5b8322e683b8981bac2 SHA1 fc14d86cd0124fd67d2ac80853f9ae078dee9a0d SHA256 a014475fab410caf209e99b448aeffe0070d1d9fc002fb33dd56f73dba87b1fd
 EBUILD zfs-0.6.0_rc9-r3.ebuild 3486 RMD160 37d3608465cf0335589d9d5aa4cb2b5f5b9978d1 SHA1 a11982042b553e87ff53e286a68cf7c668f4f05f SHA256 ad02460d658715c35c42de06cb0e3ffb969f962b24ec825d51faf6c0d531b5b6
+EBUILD zfs-0.6.0_rc9-r4.ebuild 3493 RMD160 edcf30e0c72241964a419d7b51c8a6f272ded380 SHA1 3a8aa6c0b25a732a11ffe0187f110c593b4bec5e SHA256 f1d784f4abe6193c12a17b753644e3bd1ff6a4fc56af6774c495f7d889475283
 EBUILD zfs-0.6.0_rc9.ebuild 3416 RMD160 a2a0422284ea4f00343b73c1cceb1bb7dc627ecf SHA1 99df20b38361eaac26cbaf737ce88957b916a569 SHA256 9a186a0e8eb3a4a642927fef49c4408550caa79f3003b4f2af146092901a0a45
 EBUILD zfs-9999.ebuild 3412 RMD160 0206883cf7c629abd7f0af36e1833292b6a912f2 SHA1 73ec6ab2bd5e294c94985641ddc1cffd20cac512 SHA256 2c52f1985d5bf1cc81ba85d475840edae63b00661365246dd416a8d3b508ce7d
-MISC ChangeLog 5681 RMD160 4fb7771ce005982c186f9cc41371fd25e86d50cd SHA1 339272fe4e0b2df0bd2cbab7bd3d8494b2fdd4cc SHA256 41be05098ae35035a6513ce5abb040d7563c945fbf9b96546f94e331ad719a32
+MISC ChangeLog 5929 RMD160 ef998cd30fb38df586a62c585edb95b36868d3f9 SHA1 cb6391936c6d2f563f3f5a592c1a9930c0c32528 SHA256 30e414e2bcc30896d59ed517be67e9e528ec7c17e62becffb848659c60732ac0
 MISC metadata.xml 460 RMD160 49a38cd6f7fb8464c06282672932cb5930e024b2 SHA1 2cb49a2c9bd0c05ee136ead608d7ae9a50663384 SHA256 4f32c18bfc4d75883f198b1166ad4f5d7a95deb11eca99d476f305ed31875e7d
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc9-fix-32-bit-warnings.patch b/sys-fs/zfs/files/zfs-0.6.0_rc9-fix-32-bit-warnings.patch
new file mode 100644
index 000000000000..8b487c354537
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.0_rc9-fix-32-bit-warnings.patch
@@ -0,0 +1,43 @@
+From 99aa2c28b1c96de2feee9a8edcbbe101100029c2 Mon Sep 17 00:00:00 2001
+From: Richard Yao <ryao@cs.stonybrook.edu>
+Date: Mon, 9 Jul 2012 19:41:28 -0400
+Subject: [PATCH] Use ULL suffix in constants
+
+The lack of the ULL suffix causes warnings such as the following on
+32-bit systems:
+
+In function 'zfsctl_is_snapdir':
+zfs-0.6.0//module/zfs/zfs_ctldir.c:151: warning: integer constant is too
+large for 'long' type
+
+We add the ULL suffix to fix that.
+
+This closes issue #813.
+
+Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
+---
+ include/sys/zfs_ctldir.h |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/sys/zfs_ctldir.h b/include/sys/zfs_ctldir.h
+index e598529..0a3c142 100644
+--- a/include/sys/zfs_ctldir.h
++++ b/include/sys/zfs_ctldir.h
+@@ -103,10 +103,10 @@ extern int zfsctl_shares_lookup(struct inode *dip, char *name,
+  * However, they should be as large as possible to avoid conflicts
+  * with the objects which are assigned monotonically by the dmu.
+  */
+-#define	ZFSCTL_INO_ROOT		0x0000FFFFFFFFFFFF
+-#define	ZFSCTL_INO_SHARES	0x0000FFFFFFFFFFFE
+-#define	ZFSCTL_INO_SNAPDIR	0x0000FFFFFFFFFFFD
+-#define	ZFSCTL_INO_SNAPDIRS	0x0000FFFFFFFFFFFC
++#define	ZFSCTL_INO_ROOT		0x0000FFFFFFFFFFFFULL
++#define	ZFSCTL_INO_SHARES	0x0000FFFFFFFFFFFEULL
++#define	ZFSCTL_INO_SNAPDIR	0x0000FFFFFFFFFFFDULL
++#define	ZFSCTL_INO_SNAPDIRS	0x0000FFFFFFFFFFFCULL
+ 
+ #define	ZFSCTL_EXPIRE_SNAPSHOT	300
+ 
+-- 
+1.7.10
+
diff --git a/sys-fs/zfs/zfs-0.6.0_rc9-r4.ebuild b/sys-fs/zfs/zfs-0.6.0_rc9-r4.ebuild
new file mode 100644
index 000000000000..7d6449aaa121
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.0_rc9-r4.ebuild
@@ -0,0 +1,148 @@
+# 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-0.6.0_rc9-r4.ebuild,v 1.1 2012/07/10 00:31:39 ryao Exp $
+
+EAPI="4"
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	inherit eutils versionator
+	MY_PV=$(replace_version_separator 3 '-')
+	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Native ZFS for Linux"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="CDDL GPL-2 MIT"
+SLOT="0"
+IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
+
+DEPEND="
+	=sys-kernel/spl-${PV}*
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+"
+RDEPEND="${DEPEND}
+	!sys-fs/zfs-fuse
+	!prefix? ( sys-fs/udev )
+	test-suite? (
+		sys-apps/gawk
+		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
+		)
+"
+DEPEND+="
+	test? ( sys-fs/mdadm )
+"
+
+pkg_setup() {
+	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
+		!PREEMPT
+		!PREEMPT_VOLUNTARY
+		BLK_DEV_LOOP
+		EFI_PARTITION
+		MODULES
+		ZLIB_DEFLATE
+		ZLIB_INFLATE"
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD
+			DEVTMPFS"
+	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
+	check_extra_config
+}
+
+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
+
+	if [ ${PV} != "9999" ]
+	then
+		epatch "${FILESDIR}/${P}-hardened-support.patch"
+
+		# Fix various deadlocks
+		epatch "${FILESDIR}/${P}-fix-32-bit-warnings.patch"
+		epatch "${FILESDIR}/${P}-remove-pfmalloc-1-of-3.patch"
+		epatch "${FILESDIR}/${P}-remove-pfmalloc-2-of-3.patch"
+		epatch "${FILESDIR}/${P}-remove-pfmalloc-3-of-3.patch"
+		epatch "${FILESDIR}/${P}-range-lock-caller-allocate.patch"
+	fi
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	set_arch_to_kernel
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=all
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="${EPREFIX}/lib/udev"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	if [ $UID -ne 0 ]
+	then
+		ewarn "Cannot run make check tests with FEATURES=userpriv."
+		ewarn "Skipping make check tests."
+	else
+		autotools-utils_src_test
+	fi
+}
+
+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"
+
+	if use rootfs
+	then
+		doinitd "${FILESDIR}/zfs-shutdown"
+		exeinto /usr/share/zfs
+		doexe "${FILESDIR}/linuxrc"
+	fi
+
+	newbashcomp "${FILESDIR}/bash-completion" zfs
+
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports."
+
+	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
+		|| ewarn 'You should add zfs to the boot runlevel.'
+
+	use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
+		|| ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
+
+}