summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-08-28 10:30:23 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-08-28 10:30:23 +0000
commit8521ac5240703236c800f673f34f1167a12725b3 (patch)
tree8748e797b86fc379d51ef70e59e0e1f22b1b6346 /sys-boot
parentVersion bump (diff)
downloadgentoo-2-8521ac5240703236c800f673f34f1167a12725b3.tar.gz
gentoo-2-8521ac5240703236c800f673f34f1167a12725b3.tar.bz2
gentoo-2-8521ac5240703236c800f673f34f1167a12725b3.zip
Add efiemu useflag for grub2. Fixes bug #380863.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-1.99.ebuild12
-rw-r--r--sys-boot/grub/grub-9999.ebuild12
-rw-r--r--sys-boot/grub/metadata.xml7
4 files changed, 23 insertions, 14 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index a16e89f5863b..be6a3aca03d9 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.159 2011/08/27 11:29:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.160 2011/08/28 10:30:23 scarabeus Exp $
+
+ 28 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99.ebuild,
+ grub-9999.ebuild, metadata.xml:
+ Add efiemu useflag for grub2. Fixes bug #380863.
*grub-1.99 (28 Aug 2011)
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index bd13e6eef935..f0a4f6585ae4 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99.ebuild,v 1.1 2011/08/27 11:29:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99.ebuild,v 1.2 2011/08/28 10:30:23 scarabeus Exp $
EAPI=4
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="2"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
-IUSE="custom-cflags debug device-mapper nls static sdl truetype"
+IUSE="custom-cflags debug device-mapper efiemu nls static sdl truetype"
GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# everywhere:
@@ -134,14 +134,14 @@ grub_src_configure() {
--sbindir=/sbin \
--bindir=/bin \
--libdir=/$(get_libdir) \
- --disable-efiemu \
--program-transform-name=s,grub,grub2, \
+ $(use_enable debug mm-debug) \
+ $(use_enable debug grub-emu-usb) \
$(use_enable device-mapper) \
- $(use_enable truetype grub-mkfont) \
+ $(use_enable efiemu) \
$(use_enable nls) \
- $(use_enable debug mm-debug) \
+ $(use_enable truetype grub-mkfont) \
$(use sdl && use_enable debug grub-emu-sdl) \
- $(use_enable debug grub-emu-usb) \
${platform}
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index ff941904db36..ba66a77dfe06 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.37 2011/08/27 11:29:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.38 2011/08/28 10:30:23 scarabeus Exp $
EAPI=4
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="2"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
-IUSE="custom-cflags debug device-mapper nls static sdl truetype"
+IUSE="custom-cflags debug device-mapper efiemu nls static sdl truetype"
GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
# everywhere:
@@ -134,14 +134,14 @@ grub_src_configure() {
--sbindir=/sbin \
--bindir=/bin \
--libdir=/$(get_libdir) \
- --disable-efiemu \
--program-transform-name=s,grub,grub2, \
+ $(use_enable debug mm-debug) \
+ $(use_enable debug grub-emu-usb) \
$(use_enable device-mapper) \
- $(use_enable truetype grub-mkfont) \
+ $(use_enable efiemu) \
$(use_enable nls) \
- $(use_enable debug mm-debug) \
+ $(use_enable truetype grub-mkfont) \
$(use sdl && use_enable debug grub-emu-sdl) \
- $(use_enable debug grub-emu-usb) \
${platform}
}
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 10d306a4d940..6a6b6df610ff 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -8,6 +8,11 @@
<description>Grub 2 maintainer</description>
</maintainer>
<use>
- <flag name='device-mapper'>Enable support for <pkg>sys-fs/device-mapper</pkg></flag>
+ <flag name='device-mapper'>
+ Enable support for <pkg>sys-fs/device-mapper</pkg>
+ </flag>
+ <flag name='efiemu'>
+ Build and install the efiemu runtimes
+ </flag>
</use>
</pkgmetadata>