Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
Date: Fri, 18 Nov 2011 00:04:39
Message-Id: 20111118000430.0D23C2004B@flycatcher.gentoo.org
1 vapier 11/11/18 00:04:29
2
3 Modified: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
4 Log:
5 Simplify GRUB_PLATFORMS handling, and move masking here.
6
7 (Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.8 sys-boot/grub/grub-1.99-r2.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.8&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.8&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.7&r2=1.8
15
16 Index: grub-1.99-r2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v
19 retrieving revision 1.7
20 retrieving revision 1.8
21 diff -u -r1.7 -r1.8
22 --- grub-1.99-r2.ebuild 11 Nov 2011 13:42:09 -0000 1.7
23 +++ grub-1.99-r2.ebuild 18 Nov 2011 00:04:29 -0000 1.8
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2011 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.7 2011/11/11 13:42:09 flameeyes Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.8 2011/11/18 00:04:29 vapier Exp $
29
30 EAPI=4
31
32 @@ -13,6 +13,9 @@
33 MY_P=${P/_/\~}
34 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
35 mirror://gentoo/${MY_P}.tar.xz"
36 + # Masked until documentation guys consolidate the guide and approve
37 + # it for usage.
38 + #KEYWORDS="~amd64 ~mips ~x86"
39 S=${WORKDIR}/${MY_P}
40 fi
41
42 @@ -24,24 +27,21 @@
43
44 LICENSE="GPL-3"
45 SLOT="2"
46 -[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
47 IUSE="custom-cflags debug device-mapper efiemu nls static sdl truetype"
48
49 -GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
50 -# everywhere:
51 -# emu
52 -# mips only:
53 -# qemu-mips, yeeloong
54 -# amd64, x86, ppc, ppc64
55 -# ieee1275
56 -# amd64, x86
57 -# coreboot, multiboot, efi-32, pc, qemu
58 -# amd64
59 -# efi-64
60 -for i in ${GRUB_PLATFORMS}; do
61 - IUSE+=" grub_platforms_${i}"
62 -done
63 -unset i
64 +GRUB_PLATFORMS=(
65 + # everywhere:
66 + emu
67 + # mips only:
68 + qemu-mips yeeloong
69 + # amd64, x86, ppc, ppc64:
70 + ieee1275
71 + # amd64, x86:
72 + coreboot multiboot efi-32 pc qemu
73 + # amd64:
74 + efi-64
75 +)
76 +IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
77
78 # os-prober: Used on runtime to detect other OSes
79 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
80 @@ -192,7 +192,7 @@
81
82 # get enabled platforms
83 GRUB_ENABLED_PLATFORMS=""
84 - for i in ${GRUB_PLATFORMS}; do
85 + for i in ${GRUB_PLATFORMS[@]}; do
86 use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
87 done
88 [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
89
90
91
92 1.173 sys-boot/grub/ChangeLog
93
94 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.173&view=markup
95 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.173&content-type=text/plain
96 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.172&r2=1.173
97
98 Index: ChangeLog
99 ===================================================================
100 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
101 retrieving revision 1.172
102 retrieving revision 1.173
103 diff -u -r1.172 -r1.173
104 --- ChangeLog 11 Nov 2011 13:42:09 -0000 1.172
105 +++ ChangeLog 18 Nov 2011 00:04:29 -0000 1.173
106 @@ -1,6 +1,10 @@
107 # ChangeLog for sys-boot/grub
108 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
109 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.172 2011/11/11 13:42:09 flameeyes Exp $
110 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.173 2011/11/18 00:04:29 vapier Exp $
111 +
112 + 18 Nov 2011; Mike Frysinger <vapier@g.o> grub-1.99-r2.ebuild,
113 + grub-9999.ebuild:
114 + Simplify GRUB_PLATFORMS handling, and move masking here.
115
116 11 Nov 2011; Diego E. Pettenò <flameeyes@g.o> grub-1.99-r2.ebuild,
117 grub-9999.ebuild:
118
119
120
121 1.47 sys-boot/grub/grub-9999.ebuild
122
123 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.47&view=markup
124 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.47&content-type=text/plain
125 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.46&r2=1.47
126
127 Index: grub-9999.ebuild
128 ===================================================================
129 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
130 retrieving revision 1.46
131 retrieving revision 1.47
132 diff -u -r1.46 -r1.47
133 --- grub-9999.ebuild 11 Nov 2011 13:42:09 -0000 1.46
134 +++ grub-9999.ebuild 18 Nov 2011 00:04:29 -0000 1.47
135 @@ -1,6 +1,6 @@
136 # Copyright 1999-2011 Gentoo Foundation
137 # Distributed under the terms of the GNU General Public License v2
138 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.46 2011/11/11 13:42:09 flameeyes Exp $
139 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.47 2011/11/18 00:04:29 vapier Exp $
140
141 EAPI=4
142
143 @@ -13,6 +13,9 @@
144 MY_P=${P/_/\~}
145 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
146 mirror://gentoo/${MY_P}.tar.xz"
147 + # Masked until documentation guys consolidate the guide and approve
148 + # it for usage.
149 + #KEYWORDS="~amd64 ~mips ~x86"
150 S=${WORKDIR}/${MY_P}
151 fi
152
153 @@ -24,24 +27,21 @@
154
155 LICENSE="GPL-3"
156 SLOT="2"
157 -[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
158 IUSE="custom-cflags debug device-mapper efiemu nls static sdl truetype"
159
160 -GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
161 -# everywhere:
162 -# emu
163 -# mips only:
164 -# qemu-mips, loongson
165 -# amd64, x86, ppc, ppc64
166 -# ieee1275
167 -# amd64, x86
168 -# coreboot, multiboot, efi-32, pc, qemu
169 -# amd64
170 -# efi-64
171 -for i in ${GRUB_PLATFORMS}; do
172 - IUSE+=" grub_platforms_${i}"
173 -done
174 -unset i
175 +GRUB_PLATFORMS=(
176 + # everywhere:
177 + emu
178 + # mips only:
179 + qemu-mips yeeloong
180 + # amd64, x86, ppc, ppc64:
181 + ieee1275
182 + # amd64, x86:
183 + coreboot multiboot efi-32 pc qemu
184 + # amd64:
185 + efi-64
186 +)
187 +IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
188
189 # os-prober: Used on runtime to detect other OSes
190 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
191 @@ -188,7 +188,7 @@
192
193 # get enabled platforms
194 GRUB_ENABLED_PLATFORMS=""
195 - for i in ${GRUB_PLATFORMS}; do
196 + for i in ${GRUB_PLATFORMS[@]}; do
197 use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
198 done
199 [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
Report Message
Find on MARC Find on Google Groups