summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2013-02-04 17:31:37 +0000
committerRichard Yao <ryao@gentoo.org>2013-02-04 17:31:37 +0000
commit46fdb4344ef4733fe10bed9f656dff3186ca1a71 (patch)
treec383110d61777f163d6d0b867dfdc165f96fdb56
parentWarn people using ZFS that grub2-install needs to be run to properly support ... (diff)
downloadgentoo-2-46fdb4344ef4733fe10bed9f656dff3186ca1a71.tar.gz
gentoo-2-46fdb4344ef4733fe10bed9f656dff3186ca1a71.tar.bz2
gentoo-2-46fdb4344ef4733fe10bed9f656dff3186ca1a71.zip
Make >=sys-fs/zfs-0.6.0_rc14[rootfs] block <sys-boot/grub-2.00-r2:2
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
-rw-r--r--sys-fs/zfs/ChangeLog6
-rw-r--r--sys-fs/zfs/zfs-0.6.0_rc14.ebuild9
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild3
3 files changed, 9 insertions, 9 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index cad3144d2748..a29365ab2d03 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,10 @@
# 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.59 2013/02/03 15:51:45 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.60 2013/02/04 17:31:37 ryao Exp $
+
+ 04 Feb 2013; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc14.ebuild,
+ zfs-9999.ebuild:
+ Make >=sys-fs/zfs-0.6.0_rc14[rootfs] block <sys-boot/grub-2.00-r2:2
03 Feb 2013; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc14.ebuild:
Commit warning about missing feature flags support in sys-boot/grub:2
diff --git a/sys-fs/zfs/zfs-0.6.0_rc14.ebuild b/sys-fs/zfs/zfs-0.6.0_rc14.ebuild
index c264ad1b8aad..e912e4916ea3 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc14.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc14.ebuild
@@ -1,6 +1,6 @@
# 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.0_rc14.ebuild,v 1.2 2013/02/03 15:51:45 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc14.ebuild,v 1.3 2013/02/04 17:31:37 ryao Exp $
EAPI="4"
@@ -55,6 +55,7 @@ RDEPEND="${COMMON_DEPEND}
rootfs? (
app-arch/cpio
app-misc/pax-utils
+ !<sys-boot/grub-2.00-r2:2
)
"
@@ -112,12 +113,6 @@ pkg_postinst() {
rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
fi
- if use rootfs
- then
- ewarn "sys-boot/grub:2 lacks support for feature flags."
- ewarn "If your /boot is on a ZFS pool, the pool must be version 28 or earlier."
- ewarn "Do *NOT* upgrade any pools used for booting to use feature flags."
- fi
}
pkg_postrm() {
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 93fb2e132501..46918d1d8fb3 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
# 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-9999.ebuild,v 1.42 2013/01/23 14:20:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.43 2013/02/04 17:31:37 ryao Exp $
EAPI="4"
@@ -55,6 +55,7 @@ RDEPEND="${COMMON_DEPEND}
rootfs? (
app-arch/cpio
app-misc/pax-utils
+ !<sys-boot/grub-2.00-r2:2
)
"