summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-06-29 22:06:15 +0000
committerMike Gilbert <floppym@gentoo.org>2012-06-29 22:06:15 +0000
commita1025be285c751979d53054a45df5f0c754be994 (patch)
tree119bc05333c5faf546cc60fedd6b0cc631e5e6bd
parentinitial import (diff)
downloadgentoo-2-a1025be285c751979d53054a45df5f0c754be994.tar.gz
gentoo-2-a1025be285c751979d53054a45df5f0c754be994.tar.bz2
gentoo-2-a1025be285c751979d53054a45df5f0c754be994.zip
Extend workaround for sandbox bug 404013.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-2.00.ebuild6
-rw-r--r--sys-boot/grub/grub-9999.ebuild6
3 files changed, 13 insertions, 5 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5dfd0a386ec8..43698848eaad 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.222 2012/06/29 16:21:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.223 2012/06/29 22:06:15 floppym Exp $
+
+ 29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Extend workaround for sandbox bug 404013.
29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-0.97-r12.ebuild:
grub-0.97 does not actually install files in /usr/lib, so don't copy that
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index 7c70bb19f2dc..fef8e8bb8ed0 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.ebuild
@@ -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-boot/grub/grub-2.00.ebuild,v 1.7 2012/06/29 15:34:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.8 2012/06/29 22:06:15 floppym Exp $
EAPI=4
@@ -242,9 +242,11 @@ src_configure() {
local i
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use libzfs && addpredict /etc/dfs
use static && append-ldflags -static
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4db838fa210b..e1441639b298 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -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-boot/grub/grub-9999.ebuild,v 1.73 2012/06/29 15:34:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.74 2012/06/29 22:06:15 floppym Exp $
EAPI=4
@@ -242,9 +242,11 @@ src_configure() {
local i
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use libzfs && addpredict /etc/dfs
use static && append-ldflags -static
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done