public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-fs/zfs: zfs-0.6.0_rc9.ebuild zfs-9999.ebuild ChangeLog
@ 2012-06-16 18:57 Richard Yao (ryao)
  0 siblings, 0 replies; 3+ messages in thread
From: Richard Yao (ryao) @ 2012-06-16 18:57 UTC (permalink / raw
  To: gentoo-commits

ryao        12/06/16 18:57:39

  Modified:             zfs-9999.ebuild ChangeLog
  Added:                zfs-0.6.0_rc9.ebuild
  Log:
  Introduce ZFS 0.6.0-rc9 without keywords
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.22                 sys-fs/zfs/zfs-9999.ebuild

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

Index: zfs-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- zfs-9999.ebuild	30 Apr 2012 15:38:47 -0000	1.21
+++ zfs-9999.ebuild	16 Jun 2012 18:57:39 -0000	1.22
@@ -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.21 2012/04/30 15:38:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.22 2012/06/16 18:57:39 ryao Exp $
 
 EAPI="4"
 
@@ -8,16 +8,24 @@
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit flag-o-matic git-2 linux-mod toolchain-funcs autotools-utils
+inherit 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 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=""
+fi
 
 DESCRIPTION="Native ZFS for Linux"
 HOMEPAGE="http://zfsonlinux.org/"
-SRC_URI=""
-EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
 
 LICENSE="CDDL GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
 
 DEPEND="



1.23                 sys-fs/zfs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog	17 May 2012 18:42:32 -0000	1.22
+++ ChangeLog	16 Jun 2012 18:57:39 -0000	1.23
@@ -1,6 +1,12 @@
 # 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.22 2012/05/17 18:42:32 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.23 2012/06/16 18:57:39 ryao Exp $
+
+*zfs-0.6.0_rc9 (16 Jun 2012)
+
+  16 Jun 2012; Richard Yao <ryao@gentoo.org> +zfs-0.6.0_rc9.ebuild,
+  zfs-9999.ebuild:
+  Introduce ZFS 0.6.0-rc9 without keywords
 
   17 May 2012;  <richard@gentoo.org> metadata.xml:
   Update maintainer email to use gentoo.org address



1.1                  sys-fs/zfs/zfs-0.6.0_rc9.ebuild

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

Index: zfs-0.6.0_rc9.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_rc9.ebuild,v 1.1 2012/06/16 18:57:39 ryao Exp $

EAPI="4"

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

inherit 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 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=""
fi

DESCRIPTION="Native ZFS for Linux"
HOMEPAGE="http://zfsonlinux.org/"

LICENSE="CDDL GPL-2"
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"
	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
	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

}

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

}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-fs/zfs: zfs-0.6.0_rc9.ebuild zfs-9999.ebuild ChangeLog
@ 2012-06-17 14:07 Richard Yao (ryao)
  0 siblings, 0 replies; 3+ messages in thread
From: Richard Yao (ryao) @ 2012-06-17 14:07 UTC (permalink / raw
  To: gentoo-commits

ryao        12/06/17 14:07:51

  Modified:             zfs-0.6.0_rc9.ebuild zfs-9999.ebuild ChangeLog
  Log:
  Support for sys-kernel/hardened-sources in 0.6.0-rc9, check for CONFIG_DEVTMPFS when USE=rootfs and miscellaneous style changes
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-fs/zfs/zfs-0.6.0_rc9.ebuild

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

Index: zfs-0.6.0_rc9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zfs-0.6.0_rc9.ebuild	16 Jun 2012 18:57:39 -0000	1.1
+++ zfs-0.6.0_rc9.ebuild	17 Jun 2012 14:07:51 -0000	1.2
@@ -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-0.6.0_rc9.ebuild,v 1.1 2012/06/16 18:57:39 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild,v 1.2 2012/06/17 14:07:51 ryao Exp $
 
 EAPI="4"
 
@@ -10,11 +10,11 @@
 
 inherit flag-o-matic linux-mod toolchain-funcs autotools-utils
 
-if [[ ${PV} == "9999" ]] ; then
+if [ ${PV} == "9999" ] ; then
 	inherit git-2
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
-	inherit versionator
+	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}"
@@ -64,6 +64,7 @@
 		MODULES
 		ZLIB_DEFLATE
 		ZLIB_INFLATE"
+	use rootfs && CONFIG_CHECK="${CONFIG_CHECK} DEVTMPFS"
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 	check_extra_config
 }
@@ -73,6 +74,12 @@
 	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"
+	fi
+
 	autotools-utils_src_prepare
 }
 
@@ -92,7 +99,7 @@
 }
 
 src_test() {
-	if [[ $UID -ne 0 ]]
+	if [ $UID -ne 0 ]
 	then
 		ewarn "Cannot run make check tests with FEATURES=userpriv."
 		ewarn "Skipping make check tests."



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

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

Index: zfs-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- zfs-9999.ebuild	16 Jun 2012 18:57:39 -0000	1.22
+++ zfs-9999.ebuild	17 Jun 2012 14:07:51 -0000	1.23
@@ -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.22 2012/06/16 18:57:39 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.23 2012/06/17 14:07:51 ryao Exp $
 
 EAPI="4"
 
@@ -10,11 +10,11 @@
 
 inherit flag-o-matic linux-mod toolchain-funcs autotools-utils
 
-if [[ ${PV} == "9999" ]] ; then
+if [ ${PV} == "9999" ] ; then
 	inherit git-2
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
-	inherit versionator
+	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}"
@@ -64,6 +64,7 @@
 		MODULES
 		ZLIB_DEFLATE
 		ZLIB_INFLATE"
+	use rootfs && CONFIG_CHECK="${CONFIG_CHECK} DEVTMPFS"
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 	check_extra_config
 }
@@ -73,6 +74,12 @@
 	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"
+	fi
+
 	autotools-utils_src_prepare
 }
 
@@ -92,7 +99,7 @@
 }
 
 src_test() {
-	if [[ $UID -ne 0 ]]
+	if [ $UID -ne 0 ]
 	then
 		ewarn "Cannot run make check tests with FEATURES=userpriv."
 		ewarn "Skipping make check tests."



1.24                 sys-fs/zfs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	16 Jun 2012 18:57:39 -0000	1.23
+++ ChangeLog	17 Jun 2012 14:07:51 -0000	1.24
@@ -1,6 +1,12 @@
 # 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.23 2012/06/16 18:57:39 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.24 2012/06/17 14:07:51 ryao Exp $
+
+  17 Jun 2012; Richard Yao <ryao@gentoo.org>
+  +files/zfs-0.6.0_rc9-hardened-support.patch, zfs-0.6.0_rc9.ebuild,
+  zfs-9999.ebuild:
+  Support for sys-kernel/hardened-sources in 0.6.0-rc9, check for
+  CONFIG_DEVTMPFS when USE=rootfs and miscellaneous style changes
 
 *zfs-0.6.0_rc9 (16 Jun 2012)
 






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-fs/zfs: zfs-0.6.0_rc9.ebuild zfs-9999.ebuild ChangeLog
@ 2012-06-18 15:19 Richard Yao (ryao)
  0 siblings, 0 replies; 3+ messages in thread
From: Richard Yao (ryao) @ 2012-06-18 15:19 UTC (permalink / raw
  To: gentoo-commits

ryao        12/06/18 15:19:14

  Modified:             zfs-0.6.0_rc9.ebuild zfs-9999.ebuild ChangeLog
  Log:
  Keyword ~amd64
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  sys-fs/zfs/zfs-0.6.0_rc9.ebuild

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

Index: zfs-0.6.0_rc9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zfs-0.6.0_rc9.ebuild	17 Jun 2012 17:38:43 -0000	1.4
+++ zfs-0.6.0_rc9.ebuild	18 Jun 2012 15:19:14 -0000	1.5
@@ -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-0.6.0_rc9.ebuild,v 1.4 2012/06/17 17:38:43 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild,v 1.5 2012/06/18 15:19:14 ryao Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@
 	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=""
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Native ZFS for Linux"



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

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

Index: zfs-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- zfs-9999.ebuild	17 Jun 2012 14:07:51 -0000	1.23
+++ zfs-9999.ebuild	18 Jun 2012 15:19:14 -0000	1.24
@@ -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.23 2012/06/17 14:07:51 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.24 2012/06/18 15:19:14 ryao Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@
 	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=""
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Native ZFS for Linux"
@@ -29,7 +29,7 @@
 IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
 
 DEPEND="
-	>=sys-kernel/spl-${PV}
+	=sys-kernel/spl-${PV}*
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
 "
@@ -78,6 +78,12 @@
 	if [ ${PV} != "9999" ]
 	then
 		epatch "${FILESDIR}/${P}-hardened-support.patch"
+
+		# Fix various deadlocks
+		epatch "${FILESDIR}/${P}-use-pushpage.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"
 	fi
 
 	autotools-utils_src_prepare



1.27                 sys-fs/zfs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	17 Jun 2012 17:38:43 -0000	1.26
+++ ChangeLog	18 Jun 2012 15:19:14 -0000	1.27
@@ -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.26 2012/06/17 17:38:43 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.27 2012/06/18 15:19:14 ryao Exp $
+
+  18 Jun 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9.ebuild,
+  zfs-9999.ebuild:
+  Keyword ~amd64
 
   17 Jun 2012; Richard Yao <ryao@gentoo.org>
   +files/zfs-0.6.0_rc9-remove-pfmalloc-1-of-3.patch,






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-06-18 15:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-18 15:19 [gentoo-commits] gentoo-x86 commit in sys-fs/zfs: zfs-0.6.0_rc9.ebuild zfs-9999.ebuild ChangeLog Richard Yao (ryao)
  -- strict thread matches above, loose matches on Subject: below --
2012-06-17 14:07 Richard Yao (ryao)
2012-06-16 18:57 Richard Yao (ryao)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox