| 1 |
robbat2 09/07/04 18:46:05 |
| 2 |
|
| 3 |
Modified: ChangeLog grub-0.97-r9.ebuild |
| 4 |
Log: |
| 5 |
Bug #255271: check for IA32_EMULATION on 64-bit, as we are building a 32-bit binary and need to be able to run it. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.121 sys-boot/grub/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.121&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.121&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.120&r2=1.121 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
| 18 |
retrieving revision 1.120 |
| 19 |
retrieving revision 1.121 |
| 20 |
diff -p -w -b -B -u -u -r1.120 -r1.121 |
| 21 |
--- ChangeLog 20 Jun 2009 12:43:15 -0000 1.120 |
| 22 |
+++ ChangeLog 4 Jul 2009 18:46:05 -0000 1.121 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for sys-boot/grub |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.120 2009/06/20 12:43:15 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.121 2009/07/04 18:46:05 robbat2 Exp $ |
| 28 |
+ |
| 29 |
+ 04 Jul 2009; Robin H. Johnson <robbat2@g.o> grub-0.97-r9.ebuild: |
| 30 |
+ Bug #255271: check for IA32_EMULATION on 64-bit, as we are building a |
| 31 |
+ 32-bit binary and need to be able to run it. |
| 32 |
|
| 33 |
20 Jun 2009; Mike Frysinger <vapier@g.o> grub-9999.ebuild: |
| 34 |
Enable efi/mkfont/pe2elf code and add USE=debug #273896 by John Christian |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.5 sys-boot/grub/grub-0.97-r9.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r9.ebuild?rev=1.5&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r9.ebuild?rev=1.5&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r9.ebuild?r1=1.4&r2=1.5 |
| 43 |
|
| 44 |
Index: grub-0.97-r9.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r9.ebuild,v |
| 47 |
retrieving revision 1.4 |
| 48 |
retrieving revision 1.5 |
| 49 |
diff -p -w -b -B -u -u -r1.4 -r1.5 |
| 50 |
--- grub-0.97-r9.ebuild 15 May 2009 21:11:24 -0000 1.4 |
| 51 |
+++ grub-0.97-r9.ebuild 4 Jul 2009 18:46:05 -0000 1.5 |
| 52 |
@@ -1,13 +1,13 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r9.ebuild,v 1.4 2009/05/15 21:11:24 maekke Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r9.ebuild,v 1.5 2009/07/04 18:46:05 robbat2 Exp $ |
| 57 |
|
| 58 |
# XXX: we need to review menu.lst vs grub.conf handling. We've been converting |
| 59 |
# all systems to grub.conf (and symlinking menu.lst to grub.conf), but |
| 60 |
# we never updated any of the source code (it still all wants menu.lst), |
| 61 |
# and there is no indication that upstream is making the transition. |
| 62 |
|
| 63 |
-inherit mount-boot eutils flag-o-matic toolchain-funcs autotools |
| 64 |
+inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-info |
| 65 |
|
| 66 |
PATCHVER="1.9" # Should match the revision ideally |
| 67 |
DESCRIPTION="GNU GRUB Legacy boot loader" |
| 68 |
@@ -28,6 +28,13 @@ DEPEND="ncurses? ( |
| 69 |
)" |
| 70 |
PROVIDE="virtual/bootloader" |
| 71 |
|
| 72 |
+pkg_setup() { |
| 73 |
+ local arch="$(tc-arch)" |
| 74 |
+ case ${arch} in |
| 75 |
+ amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;; |
| 76 |
+ esac |
| 77 |
+} |
| 78 |
+ |
| 79 |
src_unpack() { |
| 80 |
unpack ${A} |
| 81 |
cd "${S}" |
Archives