| 1 |
floppym 12/07/07 22:55:48 |
| 2 |
|
| 3 |
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add additional fix for bug 424231. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.77 sys-boot/grub/grub-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.77&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.77&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.76&r2=1.77 |
| 15 |
|
| 16 |
Index: grub-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v |
| 19 |
retrieving revision 1.76 |
| 20 |
retrieving revision 1.77 |
| 21 |
diff -u -r1.76 -r1.77 |
| 22 |
--- grub-9999.ebuild 1 Jul 2012 22:11:04 -0000 1.76 |
| 23 |
+++ grub-9999.ebuild 7 Jul 2012 22:55:48 -0000 1.77 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.76 2012/07/01 22:11:04 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.77 2012/07/07 22:55:48 floppym Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -207,10 +207,9 @@ |
| 33 |
} |
| 34 |
|
| 35 |
src_prepare() { |
| 36 |
- local i j |
| 37 |
- |
| 38 |
if [[ ${PV} != 9999 ]]; then |
| 39 |
- epatch "${FILESDIR}/${P}-manpage-race.patch" |
| 40 |
+ epatch "${FILESDIR}/${P}-parallel-make.patch" #424231 |
| 41 |
+ epatch "${FILESDIR}/${P}-no-gets.patch" #424703 |
| 42 |
fi |
| 43 |
|
| 44 |
# fix texinfo file name, bug 416035 |
| 45 |
@@ -237,6 +236,7 @@ |
| 46 |
|
| 47 |
# get enabled platforms |
| 48 |
GRUB_ENABLED_PLATFORMS="" |
| 49 |
+ local i |
| 50 |
for i in ${GRUB_PLATFORMS[@]}; do |
| 51 |
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}" |
| 52 |
done |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.12 sys-boot/grub/grub-2.00.ebuild |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.12&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.12&content-type=text/plain |
| 60 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.11&r2=1.12 |
| 61 |
|
| 62 |
Index: grub-2.00.ebuild |
| 63 |
=================================================================== |
| 64 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v |
| 65 |
retrieving revision 1.11 |
| 66 |
retrieving revision 1.12 |
| 67 |
diff -u -r1.11 -r1.12 |
| 68 |
--- grub-2.00.ebuild 5 Jul 2012 01:32:59 -0000 1.11 |
| 69 |
+++ grub-2.00.ebuild 7 Jul 2012 22:55:48 -0000 1.12 |
| 70 |
@@ -1,6 +1,6 @@ |
| 71 |
# Copyright 1999-2012 Gentoo Foundation |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.11 2012/07/05 01:32:59 vapier Exp $ |
| 74 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.12 2012/07/07 22:55:48 floppym Exp $ |
| 75 |
|
| 76 |
EAPI=4 |
| 77 |
|
| 78 |
@@ -207,10 +207,8 @@ |
| 79 |
} |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
- local i j |
| 83 |
- |
| 84 |
if [[ ${PV} != 9999 ]]; then |
| 85 |
- epatch "${FILESDIR}/${P}-manpage-race.patch" |
| 86 |
+ epatch "${FILESDIR}/${P}-parallel-make.patch" #424231 |
| 87 |
epatch "${FILESDIR}/${P}-no-gets.patch" #424703 |
| 88 |
fi |
| 89 |
|
| 90 |
@@ -238,6 +236,7 @@ |
| 91 |
|
| 92 |
# get enabled platforms |
| 93 |
GRUB_ENABLED_PLATFORMS="" |
| 94 |
+ local i |
| 95 |
for i in ${GRUB_PLATFORMS[@]}; do |
| 96 |
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}" |
| 97 |
done |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.227 sys-boot/grub/ChangeLog |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.227&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.227&content-type=text/plain |
| 105 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.226&r2=1.227 |
| 106 |
|
| 107 |
Index: ChangeLog |
| 108 |
=================================================================== |
| 109 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
| 110 |
retrieving revision 1.226 |
| 111 |
retrieving revision 1.227 |
| 112 |
diff -u -r1.226 -r1.227 |
| 113 |
--- ChangeLog 5 Jul 2012 01:32:59 -0000 1.226 |
| 114 |
+++ ChangeLog 7 Jul 2012 22:55:48 -0000 1.227 |
| 115 |
@@ -1,6 +1,11 @@ |
| 116 |
# ChangeLog for sys-boot/grub |
| 117 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 118 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.226 2012/07/05 01:32:59 vapier Exp $ |
| 119 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.227 2012/07/07 22:55:48 floppym Exp $ |
| 120 |
+ |
| 121 |
+ 07 Jul 2012; Mike Gilbert <floppym@g.o> |
| 122 |
+ +files/grub-2.00-parallel-make.patch, -files/grub-2.00-manpage-race.patch, |
| 123 |
+ grub-2.00.ebuild, grub-9999.ebuild: |
| 124 |
+ Add additional fix for bug 424231. |
| 125 |
|
| 126 |
05 Jul 2012; Mike Frysinger <vapier@g.o> |
| 127 |
+files/grub-2.00-no-gets.patch, grub-2.00.ebuild: |
Archives