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.98.ebuild ChangeLog grub-9999.ebuild
Date: Tue, 06 Jul 2010 00:33:42
Message-Id: 20100706003333.EEC302CE14@corvid.gentoo.org
1 vapier 10/07/06 00:33:33
2
3 Modified: grub-1.98.ebuild ChangeLog grub-9999.ebuild
4 Log:
5 Fix building with latest upstream revs #324587 by Jeff Kowalczyk.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.3 sys-boot/grub/grub-1.98.ebuild
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.98.ebuild?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.98.ebuild?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.98.ebuild?r1=1.2&r2=1.3
14
15 Index: grub-1.98.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- grub-1.98.ebuild 8 May 2010 17:21:09 -0000 1.2
22 +++ grub-1.98.ebuild 6 Jul 2010 00:33:33 -0000 1.3
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2010 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.2 2010/05/08 17:21:09 vapier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.3 2010/07/06 00:33:33 vapier Exp $
28
29 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
30
31 @@ -31,7 +31,7 @@
32 PROVIDE="virtual/bootloader"
33
34 export STRIP_MASK="*/grub/*/*.mod"
35 -QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap"
36 +QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check"
37
38 src_unpack() {
39 if [[ ${PV} == "9999" ]] ; then
40
41
42
43 1.136 sys-boot/grub/ChangeLog
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.136&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.136&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.135&r2=1.136
48
49 Index: ChangeLog
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
52 retrieving revision 1.135
53 retrieving revision 1.136
54 diff -u -r1.135 -r1.136
55 --- ChangeLog 25 Jun 2010 06:19:58 -0000 1.135
56 +++ ChangeLog 6 Jul 2010 00:33:33 -0000 1.136
57 @@ -1,6 +1,10 @@
58 # ChangeLog for sys-boot/grub
59 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
60 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.135 2010/06/25 06:19:58 robbat2 Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.136 2010/07/06 00:33:33 vapier Exp $
62 +
63 + 06 Jul 2010; Mike Frysinger <vapier@g.o> grub-1.98.ebuild,
64 + +files/grub-1.99-genkernel.patch, grub-9999.ebuild:
65 + Fix building with latest upstream revs #324587 by Jeff Kowalczyk.
66
67 *grub-0.97-r10 (25 Jun 2010)
68
69
70
71
72 1.21 sys-boot/grub/grub-9999.ebuild
73
74 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.21&view=markup
75 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.21&content-type=text/plain
76 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.20&r2=1.21
77
78 Index: grub-9999.ebuild
79 ===================================================================
80 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
81 retrieving revision 1.20
82 retrieving revision 1.21
83 diff -u -r1.20 -r1.21
84 --- grub-9999.ebuild 8 May 2010 17:21:09 -0000 1.20
85 +++ grub-9999.ebuild 6 Jul 2010 00:33:33 -0000 1.21
86 @@ -1,6 +1,8 @@
87 # Copyright 1999-2010 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.20 2010/05/08 17:21:09 vapier Exp $
90 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.21 2010/07/06 00:33:33 vapier Exp $
91 +
92 +# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
93
94 inherit mount-boot eutils flag-o-matic toolchain-funcs
95
96 @@ -29,7 +31,7 @@
97 PROVIDE="virtual/bootloader"
98
99 export STRIP_MASK="*/grub/*/*.mod"
100 -QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap"
101 +QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check"
102
103 src_unpack() {
104 if [[ ${PV} == "9999" ]] ; then
105 @@ -38,7 +40,7 @@
106 unpack ${A}
107 fi
108 cd "${S}"
109 - epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335
110 + epatch "${FILESDIR}"/${PN}-1.99-genkernel.patch #256335
111 epatch_user
112
113 # autogen.sh does more than just run autotools