summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-07-05 04:17:11 +0000
committerMike Frysinger <vapier@gentoo.org>2009-07-05 04:17:11 +0000
commitae2e04a3879012d0a89d776dbac2deaee300a7bd (patch)
treef556f49553e9238625507a34c2dd0c91aad85a67 /sys-boot
parentRemoved ruby19 from USE_RUBY, bug #275998. (diff)
downloadhistorical-ae2e04a3879012d0a89d776dbac2deaee300a7bd.tar.gz
historical-ae2e04a3879012d0a89d776dbac2deaee300a7bd.tar.bz2
historical-ae2e04a3879012d0a89d776dbac2deaee300a7bd.zip
Disable efiemu/pe2elf #276262 by Auke Booij.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog5
-rw-r--r--sys-boot/grub/Manifest14
-rw-r--r--sys-boot/grub/grub-9999.ebuild6
3 files changed, 19 insertions, 6 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 90a2805005bf..e9986ec2f428 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.121 2009/07/04 18:46:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.122 2009/07/05 04:17:11 vapier Exp $
+
+ 05 Jul 2009; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
+ Disable efiemu/pe2elf #276262 by Auke Booij.
04 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r9.ebuild:
Bug #255271: check for IA32_EMULATION on 64-bit, as we are building a
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 59671a99849a..76965fe29a73 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
AUX grub-1.95-build.patch 522 RMD160 eec01af7250a0883604530f321b154c575b14c41 SHA1 6f93b47a212ed0b3fb807bcf96e04792fa196ba1 SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf
AUX grub-1.96-genkernel.patch 298 RMD160 3acae46d0c9a6b0c97960728751c679e32f0521d SHA1 b496e4486a546cfb72b81b27d8642c7d2e5123cb SHA256 8cbbaf1db68c39dfcc30b59779d820e9e9dca7ef957431791cdc0fc24e258eaf
@@ -33,6 +36,13 @@ EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce
EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0 SHA1 46676679d76ba268bc650fbdb183893298f38c7c SHA256 3bc4b98c9e451a601eb120327bb5273629471cf6cc01c363ac4f9bfd52e0276a
EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
EBUILD grub-1.96.ebuild 1980 RMD160 b9389115b1490a018a7c47f897884db95856d1e1 SHA1 317379e018b0c5b7310c4a54a7aee36e9cb4a518 SHA256 bf84649fb9543d9ba92774efb68f97a5bc8ae1cb7fc6895d48357eb309fd92f2
-EBUILD grub-9999.ebuild 2581 RMD160 f9b59c10e3b4af3683bfb1fb44a7e76cb7751ac4 SHA1 146f01a542bbad1d50fa0c8a7d29447d57e4c173 SHA256 d6c4abcff422ae8cda18828e4b0cf231b0bb8108671d1706e5bffc078383e712
-MISC ChangeLog 26386 RMD160 99987421648608467d25213180b193d35d0ed8a0 SHA1 de01d6832ad88b036c4ffbcb6c79c24c6d04a4ad SHA256 33abff304dfeff9bff2b8b67c7d107ff6c05cac83d235b374da66a58126e2504
+EBUILD grub-9999.ebuild 2583 RMD160 2954718d336f0e3169d1441bbb42a899c4a9e962 SHA1 6a7a0f72979cb34fa95391b592d434cf72e7daba SHA256 54f672de99577ca8185d75cb45f60ad81b8a05a4a07d789a0a5b4909fcdd1b7e
+MISC ChangeLog 26501 RMD160 a6910e824df02c2b5784d57b17a0571da141e907 SHA1 c1961dbc1ceb66b1caf976db9e5b573b1d9e04d8 SHA256 d52ad242e71ada9e5d0a52fe38f1ab4c19a12a6ce85868b13edff008aa1fa647
MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkpQKU4ACgkQlPl3HsVfCDqpGgCfc1sBrZw067HfC7sdwJ34usD+
+SOcAn3tjChvkf63sLCuLothHyBDVnOZ6
+=1fN6
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 414f94f4dcd1..aa9fb7f0de21 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.10 2009/06/20 12:43:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.11 2009/07/05 04:17:11 vapier Exp $
inherit autotools mount-boot eutils flag-o-matic toolchain-funcs
@@ -53,9 +53,9 @@ src_compile() {
--sbindir=/sbin \
--bindir=/bin \
--libdir=/$(get_libdir) \
- --enable-efiemu \
+ --disable-efiemu \
+ --disable-grub-pe2elf \
--enable-grub-mkfont \
- --enable-grub-pe2elf \
$(use_enable debug mm-debug) \
$(use_enable debug grub-emu) \
$(use_enable debug grub-emu-usb) \