[gentoo-commits] gentoo-x86 commit in sys-fs/zfs: metadata.xml zfs-9999.ebuild zfs-0.6.0_rc10-r1.ebuild ChangeLog zfs-0.6.0_rc9-r6.ebuild zfs-0.6.0_rc10.ebuild

[Richard Yao (ryao)]

ryao        12/08/22 07:31:11

  Modified:             metadata.xml zfs-9999.ebuild ChangeLog
  Added:                zfs-0.6.0_rc10-r1.ebuild
  Removed:              zfs-0.6.0_rc9-r6.ebuild zfs-0.6.0_rc10.ebuild
  Log:
  Split kernel module into sys-fs/zfs-kmod
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  sys-fs/zfs/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	17 May 2012 18:42:32 -0000	1.5
+++ metadata.xml	22 Aug 2012 07:31:11 -0000	1.6
@@ -6,7 +6,7 @@
 		<name>Richard Yao</name>
 	</maintainer>
 	<use>
-		<flag name="dracut">Install dracut module</flag>
+		<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="test-suite">Install regression test suite</flag>
 	</use>



1.35                 sys-fs/zfs/zfs-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?r1=1.34&r2=1.35

Index: zfs-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- zfs-9999.ebuild	15 Aug 2012 23:04:21 -0000	1.34
+++ zfs-9999.ebuild	22 Aug 2012 07:31:11 -0000	1.35
@@ -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.34 2012/08/15 23:04:21 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.35 2012/08/22 07:31:11 ryao Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-2
@@ -21,15 +21,15 @@
 	KEYWORDS="~amd64"
 fi
 
-DESCRIPTION="Native ZFS for Linux"
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="http://zfsonlinux.org/"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
-IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
+IUSE="custom-cflags +rootfs test-suite static-libs"
+RESTRICT="test"
 
 COMMON_DEPEND="
-	=sys-kernel/spl-${PV}*
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
 "
@@ -38,6 +38,7 @@
 "
 
 RDEPEND="${COMMON_DEPEND}
+	=sys-fs/zfs-kmod-${PV}*
 	!sys-fs/zfs-fuse
 	!prefix? ( sys-fs/udev )
 	test-suite? (
@@ -55,25 +56,6 @@
 		app-misc/pax-utils
 		)
 "
-DEPEND+="
-	test? ( sys-fs/mdadm )
-"
-
-pkg_setup() {
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		!PREEMPT
-		BLK_DEV_LOOP
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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
@@ -81,28 +63,18 @@
 	# Workaround rename
 	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
 
-	if [ ${PV} != "9999" ]
-	then
-		# Fix various deadlocks
-		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-1-of-3.patch"
-		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-2-of-3.patch"
-		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-3-of-3.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-config=user
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
 		--with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-		$(use_enable debug)
 	)
 	autotools-utils_src_configure
 }
@@ -120,7 +92,7 @@
 src_install() {
 	autotools-utils_src_install
 	gen_usr_ldscript -a uutil nvpair zpool zfs
-	use dracut || rm -rf "${ED}usr/share/dracut"
+	rm -rf "${ED}usr/share/dracut"
 	use test-suite || rm -rf "${ED}usr/libexec"
 
 	if use rootfs
@@ -135,9 +107,6 @@
 }
 
 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.'



1.45                 sys-fs/zfs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.44&r2=1.45

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog	15 Aug 2012 23:04:21 -0000	1.44
+++ ChangeLog	22 Aug 2012 07:31:11 -0000	1.45
@@ -1,6 +1,20 @@
 # 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.44 2012/08/15 23:04:21 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.45 2012/08/22 07:31:11 ryao Exp $
+
+*zfs-0.6.0_rc10-r1 (22 Aug 2012)
+
+  22 Aug 2012; Richard Yao <ryao@g.o> +zfs-0.6.0_rc10-r1.ebuild,
+  -files/zfs-0.6.0_rc9-bsd-init.patch,
+  -files/zfs-0.6.0_rc9-fix-32-bit-warnings.patch,
+  -files/zfs-0.6.0_rc9-hardened-3.3-and-later-support.patch,
+  -files/zfs-0.6.0_rc9-hardened-support.patch,
+  -files/zfs-0.6.0_rc9-linux-3.5-support.patch,
+  -files/zfs-0.6.0_rc9-remove-pfmalloc-1-of-3.patch,
+  -files/zfs-0.6.0_rc9-remove-pfmalloc-2-of-3.patch,
+  -files/zfs-0.6.0_rc9-remove-pfmalloc-3-of-3.patch, -zfs-0.6.0_rc10.ebuild,
+  -zfs-0.6.0_rc9-r6.ebuild, metadata.xml, zfs-9999.ebuild:
+  Split kernel module into sys-fs/zfs-kmod
 
 *zfs-0.6.0_rc10 (15 Aug 2012)
 



1.1                  sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild?rev=1.1&content-type=text/plain

Index: zfs-0.6.0_rc10-r1.ebuild
===================================================================
# 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_rc10-r1.ebuild,v 1.1 2012/08/22 07:31:11 ryao Exp $

EAPI="4"

AT_M4DIR="config"
AUTOTOOLS_AUTORECONF="1"
AUTOTOOLS_IN_SOURCE_BUILD="1"

inherit bash-completion-r1 flag-o-matic 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="Userland utilities for ZFS Linux kernel module"
HOMEPAGE="http://zfsonlinux.org/"

LICENSE="BSD-2 CDDL MIT"
SLOT="0"
IUSE="custom-cflags +rootfs test-suite static-libs"
RESTRICT="test"

COMMON_DEPEND="
	sys-apps/util-linux[static-libs?]
	sys-libs/zlib[static-libs(+)?]
"
DEPEND="${COMMON_DEPEND}
	virtual/pkgconfig
"

RDEPEND="${COMMON_DEPEND}
	=sys-fs/zfs-kmod-${PV}*
	!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
		)
"

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
}

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="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
	)
	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
	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() {

	[ -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.')

}