1 |
floppym 12/06/25 03:53:43 |
2 |
|
3 |
Modified: grub-9999.ebuild ChangeLog |
4 |
Added: grub-2.00_rc1.ebuild |
5 |
Log: |
6 |
Version bump. Tweak efiemu configure option, bug 422835 by Rafał Mużyło. |
7 |
|
8 |
(Portage version: 2.2.0_alpha112/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.68 sys-boot/grub/grub-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.68&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.68&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.67&r2=1.68 |
16 |
|
17 |
Index: grub-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v |
20 |
retrieving revision 1.67 |
21 |
retrieving revision 1.68 |
22 |
diff -u -r1.67 -r1.68 |
23 |
--- grub-9999.ebuild 9 Jun 2012 04:47:30 -0000 1.67 |
24 |
+++ grub-9999.ebuild 25 Jun 2012 03:53:43 -0000 1.68 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.67 2012/06/09 04:47:30 floppym Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.68 2012/06/25 03:53:43 floppym Exp $ |
30 |
|
31 |
EAPI=4 |
32 |
|
33 |
@@ -11,7 +11,7 @@ |
34 |
DO_AUTORECONF="true" |
35 |
else |
36 |
MY_P=${P/_/\~} |
37 |
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then |
38 |
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then |
39 |
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" |
40 |
else |
41 |
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz |
42 |
@@ -129,6 +129,7 @@ |
43 |
grub_src_configure() { |
44 |
local platform=$1 |
45 |
local with_platform= |
46 |
+ local enable_efiemu="--disable-efiemu" |
47 |
|
48 |
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]" |
49 |
|
50 |
@@ -160,7 +161,14 @@ |
51 |
with_platform="--with-platform=efi" |
52 |
;; |
53 |
guessed) ;; |
54 |
- *) with_platform="--with-platform=${platform}" ;; |
55 |
+ *) |
56 |
+ with_platform="--with-platform=${platform}" |
57 |
+ case ${CTARGET:-${CHOST}} in |
58 |
+ i?86*|x86_64*) |
59 |
+ enable_efiemu=$(use_enable efiemu) |
60 |
+ ;; |
61 |
+ esac |
62 |
+ ;; |
63 |
esac |
64 |
|
65 |
ECONF_SOURCE="${S}" \ |
66 |
@@ -173,7 +181,7 @@ |
67 |
$(use_enable debug mm-debug) \ |
68 |
$(use_enable debug grub-emu-usb) \ |
69 |
$(use_enable device-mapper) \ |
70 |
- $(use_enable efiemu) \ |
71 |
+ ${enable_efiemu} \ |
72 |
$(use_enable mount grub-mount) \ |
73 |
$(use_enable nls) \ |
74 |
$(use_enable truetype grub-mkfont) \ |
75 |
|
76 |
|
77 |
|
78 |
1.213 sys-boot/grub/ChangeLog |
79 |
|
80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.213&view=markup |
81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.213&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.212&r2=1.213 |
83 |
|
84 |
Index: ChangeLog |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
87 |
retrieving revision 1.212 |
88 |
retrieving revision 1.213 |
89 |
diff -u -r1.212 -r1.213 |
90 |
--- ChangeLog 17 Jun 2012 03:37:43 -0000 1.212 |
91 |
+++ ChangeLog 25 Jun 2012 03:53:43 -0000 1.213 |
92 |
@@ -1,6 +1,12 @@ |
93 |
# ChangeLog for sys-boot/grub |
94 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
95 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.212 2012/06/17 03:37:43 floppym Exp $ |
96 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.213 2012/06/25 03:53:43 floppym Exp $ |
97 |
+ |
98 |
+*grub-2.00_rc1 (25 Jun 2012) |
99 |
+ |
100 |
+ 25 Jun 2012; Mike Gilbert <floppym@g.o> +grub-2.00_rc1.ebuild, |
101 |
+ grub-9999.ebuild: |
102 |
+ Version bump. Tweak efiemu configure option, bug 422835 by Rafał Mużyło. |
103 |
|
104 |
17 Jun 2012; Mike Gilbert <floppym@g.o> metadata.xml: |
105 |
Remove redundant maintainer node. |
106 |
|
107 |
|
108 |
|
109 |
1.1 sys-boot/grub/grub-2.00_rc1.ebuild |
110 |
|
111 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00_rc1.ebuild?rev=1.1&view=markup |
112 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00_rc1.ebuild?rev=1.1&content-type=text/plain |
113 |
|
114 |
Index: grub-2.00_rc1.ebuild |
115 |
=================================================================== |
116 |
# Copyright 1999-2012 Gentoo Foundation |
117 |
# Distributed under the terms of the GNU General Public License v2 |
118 |
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_rc1.ebuild,v 1.1 2012/06/25 03:53:43 floppym Exp $ |
119 |
|
120 |
EAPI=4 |
121 |
|
122 |
if [[ ${PV} == "9999" ]] ; then |
123 |
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/" |
124 |
LIVE_ECLASS="bzr" |
125 |
SRC_URI="" |
126 |
DO_AUTORECONF="true" |
127 |
else |
128 |
MY_P=${P/_/\~} |
129 |
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then |
130 |
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" |
131 |
else |
132 |
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz |
133 |
mirror://gentoo/${MY_P}.tar.xz" |
134 |
fi |
135 |
# Masked until documentation guys consolidate the guide and approve |
136 |
# it for usage. |
137 |
#KEYWORDS="~amd64 ~mips ~x86" |
138 |
S=${WORKDIR}/${MY_P} |
139 |
fi |
140 |
|
141 |
inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS} |
142 |
unset LIVE_ECLASS |
143 |
|
144 |
DESCRIPTION="GNU GRUB boot loader" |
145 |
HOMEPAGE="http://www.gnu.org/software/grub/" |
146 |
|
147 |
LICENSE="GPL-3" |
148 |
SLOT="2" |
149 |
IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs" |
150 |
|
151 |
GRUB_PLATFORMS=( |
152 |
# everywhere: |
153 |
emu |
154 |
# mips only: |
155 |
qemu-mips yeeloong |
156 |
# amd64, x86, ppc, ppc64: |
157 |
ieee1275 |
158 |
# amd64, x86: |
159 |
coreboot multiboot efi-32 pc qemu |
160 |
# amd64, ia64: |
161 |
efi-64 |
162 |
) |
163 |
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}" |
164 |
|
165 |
# os-prober: Used on runtime to detect other OSes |
166 |
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue |
167 |
RDEPEND=" |
168 |
dev-libs/lzo |
169 |
>=sys-libs/ncurses-5.2-r5 |
170 |
debug? ( |
171 |
sdl? ( media-libs/libsdl ) |
172 |
) |
173 |
device-mapper? ( >=sys-fs/lvm2-2.02.45 ) |
174 |
libzfs? ( sys-fs/zfs ) |
175 |
mount? ( sys-fs/fuse ) |
176 |
truetype? ( |
177 |
media-libs/freetype |
178 |
>=media-fonts/unifont-5 |
179 |
) |
180 |
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) |
181 |
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) |
182 |
" |
183 |
DEPEND="${RDEPEND} |
184 |
>=dev-lang/python-2.5.2 |
185 |
sys-devel/flex |
186 |
virtual/yacc |
187 |
sys-apps/texinfo |
188 |
static? ( |
189 |
truetype? ( |
190 |
app-arch/bzip2[static-libs(+)] |
191 |
media-libs/freetype[static-libs(+)] |
192 |
sys-libs/zlib[static-libs(+)] |
193 |
) |
194 |
) |
195 |
" |
196 |
RDEPEND+=" |
197 |
grub_platforms_efi-32? ( sys-boot/efibootmgr ) |
198 |
grub_platforms_efi-64? ( sys-boot/efibootmgr ) |
199 |
" |
200 |
if [[ -n ${DO_AUTORECONF} ]] ; then |
201 |
DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man" |
202 |
else |
203 |
DEPEND+=" app-arch/xz-utils" |
204 |
fi |
205 |
|
206 |
export STRIP_MASK="*/grub/*/*.{mod,img}" |
207 |
|
208 |
QA_EXECSTACK=" |
209 |
usr/bin/grub* |
210 |
usr/sbin/grub* |
211 |
usr/lib*/grub/*/*.mod |
212 |
usr/lib*/grub/*/kernel.exec |
213 |
usr/lib*/grub/*/kernel.img |
214 |
usr/lib*/grub/*/setjmp.module |
215 |
" |
216 |
|
217 |
QA_WX_LOAD=" |
218 |
usr/lib*/grub/*/kernel.exec |
219 |
usr/lib*/grub/*/kernel.img |
220 |
usr/lib*/grub/*/*.image |
221 |
" |
222 |
|
223 |
QA_PRESTRIPPED=" |
224 |
usr/lib.*/grub/.*/kernel.img |
225 |
" |
226 |
|
227 |
grub_run_phase() { |
228 |
local phase=$1 |
229 |
local platform=$2 |
230 |
[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]" |
231 |
|
232 |
[[ -d "${WORKDIR}/build-${platform}" ]] || \ |
233 |
{ mkdir "${WORKDIR}/build-${platform}" || die ; } |
234 |
pushd "${WORKDIR}/build-${platform}" > /dev/null || die |
235 |
|
236 |
echo ">>> Running ${phase} for platform \"${platform}\"" |
237 |
echo ">>> Working in: \"${WORKDIR}/build-${platform}\"" |
238 |
|
239 |
grub_${phase} ${platform} |
240 |
|
241 |
popd > /dev/null || die |
242 |
} |
243 |
|
244 |
grub_src_configure() { |
245 |
local platform=$1 |
246 |
local with_platform= |
247 |
local enable_efiemu="--disable-efiemu" |
248 |
|
249 |
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]" |
250 |
|
251 |
# Used below for efi cross-building |
252 |
tc-export CC NM OBJCOPY STRIP |
253 |
|
254 |
estack_push CTARGET "${CTARGET}" |
255 |
estack_push TARGET_CC "${TARGET_CC}" |
256 |
estack_push TARGET_CFLAGS "${TARGET_CFLAGS}" |
257 |
estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}" |
258 |
|
259 |
case ${platform} in |
260 |
efi-32) |
261 |
if [[ ${CHOST} == x86_64* ]]; then |
262 |
CTARGET="${CTARGET:-i386}" |
263 |
TARGET_CC="${TARGET_CC:-${CC}}" |
264 |
export TARGET_CC |
265 |
fi |
266 |
with_platform="--with-platform=efi" |
267 |
;; |
268 |
efi-64) |
269 |
if [[ ${CHOST} == i?86* ]]; then |
270 |
CTARGET="${CTARGET:-x86_64}" |
271 |
TARGET_CC="${TARGET_CC:-${CC}}" |
272 |
TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" |
273 |
TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
274 |
export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS |
275 |
fi |
276 |
with_platform="--with-platform=efi" |
277 |
;; |
278 |
guessed) ;; |
279 |
*) |
280 |
with_platform="--with-platform=${platform}" |
281 |
case ${CTARGET:-${CHOST}} in |
282 |
i?86*|x86_64*) |
283 |
enable_efiemu=$(use_enable efiemu) |
284 |
;; |
285 |
esac |
286 |
;; |
287 |
esac |
288 |
|
289 |
ECONF_SOURCE="${S}" \ |
290 |
econf \ |
291 |
--disable-werror \ |
292 |
--program-prefix= \ |
293 |
--program-transform-name="s,grub,grub2," \ |
294 |
--with-grubdir=grub2 \ |
295 |
${with_platform} \ |
296 |
$(use_enable debug mm-debug) \ |
297 |
$(use_enable debug grub-emu-usb) \ |
298 |
$(use_enable device-mapper) \ |
299 |
${enable_efiemu} \ |
300 |
$(use_enable mount grub-mount) \ |
301 |
$(use_enable nls) \ |
302 |
$(use_enable truetype grub-mkfont) \ |
303 |
$(use_enable libzfs) \ |
304 |
$(use sdl && use_enable debug grub-emu-sdl) |
305 |
|
306 |
estack_pop CTARGET CTARGET || die |
307 |
estack_pop TARGET_CC TARGET_CC || die |
308 |
estack_pop TARGET_CFLAGS TARGET_CFLAGS || die |
309 |
estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die |
310 |
} |
311 |
|
312 |
grub_src_compile() { |
313 |
default_src_compile |
314 |
pax-mark -mpes "${grub_binaries[@]}" |
315 |
} |
316 |
|
317 |
grub_src_install() { |
318 |
default_src_install |
319 |
} |
320 |
|
321 |
src_prepare() { |
322 |
local i j |
323 |
|
324 |
# fix texinfo file name, bug 416035 |
325 |
sed -i \ |
326 |
-e 's/^\* GRUB:/* GRUB2:/' \ |
327 |
-e 's/(grub)/(grub2)/' -- \ |
328 |
"${S}"/docs/grub.texi |
329 |
|
330 |
epatch_user |
331 |
|
332 |
# autogen.sh does more than just run autotools |
333 |
if [[ -n ${DO_AUTORECONF} ]] ; then |
334 |
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die |
335 |
( |
336 |
autopoint() { :; } |
337 |
. ./autogen.sh |
338 |
) || die |
339 |
fi |
340 |
|
341 |
# install into the right dir for eselect #372735 |
342 |
sed -i \ |
343 |
-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \ |
344 |
util/bash-completion.d/Makefile.in || die |
345 |
|
346 |
# get enabled platforms |
347 |
GRUB_ENABLED_PLATFORMS="" |
348 |
for i in ${GRUB_PLATFORMS[@]}; do |
349 |
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}" |
350 |
done |
351 |
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed" |
352 |
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}" |
353 |
} |
354 |
|
355 |
src_configure() { |
356 |
local i |
357 |
|
358 |
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS |
359 |
use libzfs && addpredict /etc/dfs |
360 |
use static && append-ldflags -static |
361 |
|
362 |
for i in ${GRUB_ENABLED_PLATFORMS}; do |
363 |
grub_run_phase ${FUNCNAME} ${i} |
364 |
done |
365 |
} |
366 |
|
367 |
src_compile() { |
368 |
# Used for pax marking in grub_src_compile |
369 |
local grub_binaries=( |
370 |
grub-editenv |
371 |
grub-fstest |
372 |
grub-menulst2cfg |
373 |
grub-mkimage |
374 |
grub-mklayout |
375 |
grub-mkpasswd-pbkdf2 |
376 |
grub-mkrelpath |
377 |
grub-script-check |
378 |
grub-bios-setup |
379 |
grub-ofpathname |
380 |
grub-probe |
381 |
grub-sparc64-setup |
382 |
) |
383 |
use mount && grub_binaries+=( grub-mount ) |
384 |
use truetype && grub_binaries+=( grub-mkfont ) |
385 |
|
386 |
local i |
387 |
|
388 |
for i in ${GRUB_ENABLED_PLATFORMS}; do |
389 |
grub_run_phase ${FUNCNAME} ${i} |
390 |
done |
391 |
} |
392 |
|
393 |
src_install() { |
394 |
local i |
395 |
|
396 |
for i in ${GRUB_ENABLED_PLATFORMS}; do |
397 |
grub_run_phase ${FUNCNAME} ${i} |
398 |
done |
399 |
|
400 |
mv "${ED}"usr/share/info/grub{,2}.info || die |
401 |
|
402 |
# can't be in docs array as we use default_src_install in different builddir |
403 |
dodoc AUTHORS ChangeLog NEWS README THANKS TODO |
404 |
insinto /etc/default |
405 |
newins "${FILESDIR}"/grub.default grub |
406 |
} |
407 |
|
408 |
pkg_postinst() { |
409 |
# display the link to guide |
410 |
elog "For information on how to configure grub-2 please refer to the guide:" |
411 |
elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start" |
412 |
if ! has_version sys-boot/os-prober; then |
413 |
elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig." |
414 |
fi |
415 |
if ! has_version dev-libs/libisoburn; then |
416 |
elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue." |
417 |
fi |
418 |
} |