1 |
floppym 13/12/24 22:42:11 |
2 |
|
3 |
Modified: grub-9999-r1.ebuild ChangeLog |
4 |
Added: grub-2.02_beta2.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.10 sys-boot/grub/grub-9999-r1.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?rev=1.10&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?rev=1.10&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?r1=1.9&r2=1.10 |
16 |
|
17 |
Index: grub-9999-r1.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v |
20 |
retrieving revision 1.9 |
21 |
retrieving revision 1.10 |
22 |
diff -u -r1.9 -r1.10 |
23 |
--- grub-9999-r1.ebuild 24 Dec 2013 02:41:11 -0000 1.9 |
24 |
+++ grub-9999-r1.ebuild 24 Dec 2013 22:42:11 -0000 1.10 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2013 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-r1.ebuild,v 1.9 2013/12/24 02:41:11 floppym Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.10 2013/12/24 22:42:11 floppym Exp $ |
30 |
|
31 |
EAPI=5 |
32 |
|
33 |
@@ -28,7 +28,7 @@ |
34 |
S=${WORKDIR}/${P%_*} |
35 |
fi |
36 |
KEYWORDS="~amd64 ~x86" |
37 |
- PATCHES=( "${FILESDIR}/${P}-only-use-scripts-that-are-executable.patch" ) |
38 |
+ PATCHES=() |
39 |
else |
40 |
inherit git-r3 |
41 |
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git |
42 |
|
43 |
|
44 |
|
45 |
1.301 sys-boot/grub/ChangeLog |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.301&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.301&content-type=text/plain |
49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.300&r2=1.301 |
50 |
|
51 |
Index: ChangeLog |
52 |
=================================================================== |
53 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
54 |
retrieving revision 1.300 |
55 |
retrieving revision 1.301 |
56 |
diff -u -r1.300 -r1.301 |
57 |
--- ChangeLog 24 Dec 2013 02:41:11 -0000 1.300 |
58 |
+++ ChangeLog 24 Dec 2013 22:42:11 -0000 1.301 |
59 |
@@ -1,6 +1,12 @@ |
60 |
# ChangeLog for sys-boot/grub |
61 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
62 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.300 2013/12/24 02:41:11 floppym Exp $ |
63 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.301 2013/12/24 22:42:11 floppym Exp $ |
64 |
+ |
65 |
+*grub-2.02_beta2 (24 Dec 2013) |
66 |
+ |
67 |
+ 24 Dec 2013; Mike Gilbert <floppym@g.o> +grub-2.02_beta2.ebuild, |
68 |
+ grub-9999-r1.ebuild: |
69 |
+ Version bump. |
70 |
|
71 |
24 Dec 2013; Mike Gilbert <floppym@g.o> -grub-2.02_beta1.ebuild, |
72 |
grub-2.02_beta1-r1.ebuild, grub-9999-r1.ebuild: |
73 |
|
74 |
|
75 |
|
76 |
1.1 sys-boot/grub/grub-2.02_beta2.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: grub-2.02_beta2.ebuild |
82 |
=================================================================== |
83 |
# Copyright 1999-2013 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v 1.1 2013/12/24 22:42:11 floppym Exp $ |
86 |
|
87 |
EAPI=5 |
88 |
|
89 |
if [[ ${PV} == 9999 ]]; then |
90 |
AUTOTOOLS_AUTORECONF=1 |
91 |
GRUB_AUTOGEN=1 |
92 |
fi |
93 |
|
94 |
if [[ -n ${GRUB_AUTOGEN} ]]; then |
95 |
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) |
96 |
inherit python-any-r1 |
97 |
fi |
98 |
|
99 |
inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator |
100 |
|
101 |
if [[ ${PV} != 9999 ]]; then |
102 |
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then |
103 |
MY_P="${P/_/~}" |
104 |
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" |
105 |
S=${WORKDIR}/${MY_P} |
106 |
else |
107 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz |
108 |
mirror://gentoo/${P}.tar.xz |
109 |
http://dev.gentoo.org/~floppym/dist/${P}.tar.xz" |
110 |
S=${WORKDIR}/${P%_*} |
111 |
fi |
112 |
KEYWORDS="~amd64 ~x86" |
113 |
PATCHES=() |
114 |
else |
115 |
inherit git-r3 |
116 |
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git |
117 |
http://git.savannah.gnu.org/r/grub.git" |
118 |
fi |
119 |
|
120 |
DEJAVU=dejavu-sans-ttf-2.34 |
121 |
UNIFONT=unifont-6.3.20131217 |
122 |
SRC_URI+=" truetype? ( |
123 |
mirror://sourceforge/dejavu/${DEJAVU}.zip |
124 |
http://unifoundry.com/pub/${UNIFONT}/${UNIFONT}.pcf.gz |
125 |
)" |
126 |
|
127 |
DESCRIPTION="GNU GRUB boot loader" |
128 |
HOMEPAGE="http://www.gnu.org/software/grub/" |
129 |
|
130 |
# Includes licenses for dejavu and unifont |
131 |
LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" |
132 |
SLOT="2" |
133 |
IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs" |
134 |
|
135 |
GRUB_ALL_PLATFORMS=( |
136 |
# everywhere: |
137 |
emu |
138 |
# mips only: |
139 |
qemu-mips yeeloong |
140 |
# amd64, x86, ppc, ppc64: |
141 |
ieee1275 |
142 |
# amd64, x86: |
143 |
coreboot multiboot efi-32 pc qemu |
144 |
# amd64, ia64: |
145 |
efi-64 |
146 |
) |
147 |
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" |
148 |
|
149 |
REQUIRED_USE="grub_platforms_qemu? ( truetype ) |
150 |
grub_platforms_yeeloong? ( truetype )" |
151 |
|
152 |
# os-prober: Used on runtime to detect other OSes |
153 |
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue |
154 |
RDEPEND=" |
155 |
app-arch/xz-utils |
156 |
>=sys-libs/ncurses-5.2-r5 |
157 |
debug? ( |
158 |
sdl? ( media-libs/libsdl ) |
159 |
) |
160 |
device-mapper? ( >=sys-fs/lvm2-2.02.45 ) |
161 |
libzfs? ( sys-fs/zfs ) |
162 |
mount? ( sys-fs/fuse ) |
163 |
truetype? ( media-libs/freetype ) |
164 |
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) |
165 |
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) |
166 |
" |
167 |
DEPEND="${RDEPEND} |
168 |
${PYTHON_DEPS} |
169 |
app-misc/pax-utils |
170 |
sys-devel/flex |
171 |
sys-devel/bison |
172 |
sys-apps/help2man |
173 |
sys-apps/texinfo |
174 |
static? ( |
175 |
app-arch/xz-utils[static-libs(+)] |
176 |
truetype? ( |
177 |
app-arch/bzip2[static-libs(+)] |
178 |
media-libs/freetype[static-libs(+)] |
179 |
sys-libs/zlib[static-libs(+)] |
180 |
) |
181 |
) |
182 |
test? ( |
183 |
dev-libs/libisoburn |
184 |
app-emulation/qemu |
185 |
) |
186 |
truetype? ( app-arch/unzip ) |
187 |
" |
188 |
RDEPEND+=" |
189 |
kernel_linux? ( |
190 |
grub_platforms_efi-32? ( sys-boot/efibootmgr ) |
191 |
grub_platforms_efi-64? ( sys-boot/efibootmgr ) |
192 |
) |
193 |
!multislot? ( !sys-boot/grub:0 ) |
194 |
" |
195 |
|
196 |
STRIP_MASK="*/grub/*/*.{mod,img}" |
197 |
RESTRICT="test" |
198 |
|
199 |
QA_EXECSTACK=" |
200 |
usr/bin/grub*-emu* |
201 |
usr/lib*/grub/*/*.mod |
202 |
usr/lib*/grub/*/*.module |
203 |
usr/lib*/grub/*/kernel.exec |
204 |
usr/lib*/grub/*/kernel.img |
205 |
" |
206 |
|
207 |
QA_WX_LOAD=" |
208 |
usr/lib*/grub/*/kernel.exec |
209 |
usr/lib*/grub/*/kernel.img |
210 |
usr/lib*/grub/*/*.image |
211 |
" |
212 |
|
213 |
QA_PRESTRIPPED=" |
214 |
usr/lib.*/grub/.*/kernel.img |
215 |
" |
216 |
|
217 |
pkg_pretend() { |
218 |
if [[ ${MERGE_TYPE} != binary ]]; then |
219 |
# Bug 439082 |
220 |
if ! version_is_at_least 4.8 "$(gcc-version)" && |
221 |
$(tc-getLD) --version | grep -q "GNU gold"; then |
222 |
eerror "GRUB does not function correctly when built with the gold linker." |
223 |
eerror "Please select the bfd linker with binutils-config." |
224 |
die "GNU gold detected" |
225 |
fi |
226 |
fi |
227 |
} |
228 |
|
229 |
src_unpack() { |
230 |
if [[ ${PV} == 9999 ]]; then |
231 |
git-r3_src_unpack |
232 |
fi |
233 |
default_src_unpack |
234 |
} |
235 |
|
236 |
src_prepare() { |
237 |
[[ ${PATCHES} ]] && epatch "${PATCHES[@]}" |
238 |
sed -i -e /autoreconf/d autogen.sh || die |
239 |
if use multislot; then |
240 |
# fix texinfo file name, bug 416035 |
241 |
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die |
242 |
fi |
243 |
epatch_user |
244 |
if [[ -n ${GRUB_AUTOGEN} ]]; then |
245 |
python_setup |
246 |
bash autogen.sh || die |
247 |
fi |
248 |
if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then |
249 |
autopoint() { return 0; } |
250 |
eautoreconf |
251 |
fi |
252 |
} |
253 |
|
254 |
setup_fonts() { |
255 |
ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die |
256 |
ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die |
257 |
} |
258 |
|
259 |
grub_configure() { |
260 |
local platform |
261 |
|
262 |
case ${MULTIBUILD_VARIANT} in |
263 |
efi-32) |
264 |
platform=efi |
265 |
if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then |
266 |
local CTARGET=${CTARGET:-i386} |
267 |
fi ;; |
268 |
efi-64) |
269 |
platform=efi |
270 |
if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then |
271 |
local CTARGET=${CTARGET:-x86_64} |
272 |
local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" |
273 |
local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
274 |
export TARGET_CFLAGS TARGET_CPPFLAGS |
275 |
fi ;; |
276 |
guessed) ;; |
277 |
*) platform=${MULTIBUILD_VARIANT} ;; |
278 |
esac |
279 |
|
280 |
local myeconfargs=( |
281 |
--disable-werror |
282 |
--program-prefix= |
283 |
--libdir="${EPREFIX}"/usr/lib |
284 |
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
285 |
$(use_enable debug mm-debug) |
286 |
$(use_enable debug grub-emu-usb) |
287 |
$(use_enable device-mapper) |
288 |
$(use_enable mount grub-mount) |
289 |
$(use_enable nls) |
290 |
$(use_enable truetype grub-mkfont) |
291 |
$(use_enable libzfs) |
292 |
$(use sdl && use_enable debug grub-emu-sdl) |
293 |
${platform:+--with-platform=}${platform} |
294 |
|
295 |
# Let configure detect this where supported |
296 |
$(usex efiemu '' '--disable-efiemu') |
297 |
) |
298 |
|
299 |
if use multislot; then |
300 |
myeconfargs+=( --program-transform-name="s,grub,grub2," ) |
301 |
fi |
302 |
|
303 |
if use truetype; then |
304 |
mkdir -p "${BUILD_DIR}" || die |
305 |
run_in_build_dir setup_fonts |
306 |
fi |
307 |
|
308 |
autotools-utils_src_configure |
309 |
} |
310 |
|
311 |
src_configure() { |
312 |
# We don't want to leak flags onto boot code. |
313 |
export HOST_CCASFLAGS=${CCASFLAGS} |
314 |
export HOST_CFLAGS=${CFLAGS} |
315 |
export HOST_CPPFLAGS=${CPPFLAGS} |
316 |
export HOST_LDFLAGS=${LDFLAGS} |
317 |
unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS |
318 |
|
319 |
use static && HOST_LDFLAGS+=" -static" |
320 |
|
321 |
if version_is_at_least 4.8 "$(gcc-version)"; then |
322 |
export TARGET_LDFLAGS+=" -fuse-ld=bfd" |
323 |
fi |
324 |
|
325 |
tc-export CC NM OBJCOPY STRIP |
326 |
export TARGET_CC=${TARGET_CC:-${CC}} |
327 |
tc-export BUILD_CC # Bug 485592 |
328 |
|
329 |
# Portage will take care of cleaning up GRUB_PLATFORMS |
330 |
MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} ) |
331 |
multibuild_parallel_foreach_variant grub_configure |
332 |
} |
333 |
|
334 |
src_compile() { |
335 |
# Sandbox bug 404013. |
336 |
use libzfs && addpredict /etc/dfs:/dev/zfs |
337 |
|
338 |
multibuild_foreach_variant autotools-utils_src_compile |
339 |
|
340 |
use doc && multibuild_for_best_variant \ |
341 |
autotools-utils_src_compile -C docs html |
342 |
} |
343 |
|
344 |
src_test() { |
345 |
# The qemu dependency is a bit complex. |
346 |
# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. |
347 |
multibuild_foreach_variant autotools-utils_src_test |
348 |
} |
349 |
|
350 |
src_install() { |
351 |
multibuild_foreach_variant autotools-utils_src_install \ |
352 |
bashcompletiondir="$(get_bashcompdir)" |
353 |
|
354 |
use doc && multibuild_for_best_variant run_in_build_dir \ |
355 |
emake -C docs DESTDIR="${D}" install-html |
356 |
|
357 |
if use multislot; then |
358 |
mv "${ED%/}"/usr/share/info/grub{,2}.info || die |
359 |
fi |
360 |
|
361 |
insinto /etc/default |
362 |
newins "${FILESDIR}"/grub.default-3 grub |
363 |
} |
364 |
|
365 |
pkg_postinst() { |
366 |
mount-boot_mount_boot_partition |
367 |
|
368 |
if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then |
369 |
mkdir -p "${ROOT%/}/boot/grub" |
370 |
ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg" |
371 |
fi |
372 |
|
373 |
mount-boot_pkg_postinst |
374 |
|
375 |
elog "For information on how to configure GRUB2 please refer to the guide:" |
376 |
elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start" |
377 |
|
378 |
if has_version 'sys-boot/grub:0'; then |
379 |
elog "A migration guide for GRUB Legacy users is available:" |
380 |
elog " http://www.gentoo.org/doc/en/grub2-migration.xml" |
381 |
fi |
382 |
|
383 |
if [[ -z ${REPLACING_VERSIONS} ]]; then |
384 |
if ! has_version sys-boot/os-prober; then |
385 |
elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig." |
386 |
fi |
387 |
if ! has_version dev-libs/libisoburn; then |
388 |
elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue." |
389 |
fi |
390 |
else |
391 |
local v |
392 |
for v in ${REPLACING_VERSIONS}; do |
393 |
if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; then |
394 |
ewarn "The grub directory has changed from /boot/grub2 to /boot/grub." |
395 |
ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg." |
396 |
break |
397 |
fi |
398 |
done |
399 |
fi |
400 |
} |