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

Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@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: Mon, 03 Oct 2011 09:10:23
Message-Id: 20111003091013.AA4AD2004B@flycatcher.gentoo.org
1 scarabeus 11/10/03 09:10:13
2
3 Modified: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
4 Log:
5 Include minor fixes from Robert Trace <rtrace{at}farcaster.org>
6
7 (Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.4 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.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.3&r2=1.4
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.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- grub-1.99-r2.ebuild 14 Sep 2011 17:57:08 -0000 1.3
23 +++ grub-1.99-r2.ebuild 3 Oct 2011 09:10:13 -0000 1.4
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.3 2011/09/14 17:57:08 scarabeus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.4 2011/10/03 09:10:13 scarabeus Exp $
29
30 EAPI=4
31
32 @@ -235,10 +235,10 @@
33 "bin/grub2-mkimage"
34 )
35 for e in ${PAX[@]}; do
36 - pax-mark -mpx "${ED}/${e}"
37 + pax-mark -mp "${ED}/${e}"
38 done
39
40 - # can't be in docs array as we use defualt_src_install in different builddir
41 + # can't be in docs array as we use default_src_install in different builddir
42 dodoc AUTHORS ChangeLog NEWS README THANKS TODO
43 insinto /etc/default
44 newins "${FILESDIR}"/grub.default grub
45 @@ -246,7 +246,7 @@
46 GRUB_DISTRIBUTOR="Gentoo"
47 EOF
48
49 - elog "Remember to run emerge --config =${CATEGORY}/${P} in order"
50 + elog "Remember to run emerge --config =${CATEGORY}/${PF} in order"
51 elog "to set up basic settings for this package."
52 }
53
54 @@ -254,9 +254,12 @@
55 local dir=$1
56
57 # display the link to guide
58 - elog "For informations how to configure grub-2 please reffer to the guide:"
59 + elog "For informations how to configure grub-2 please refer to the guide:"
60 elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
61
62 + # Make sure target directory exists
63 + mkdir -p "${dir}"
64 +
65 if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
66 # This is first grub2 install and we have old configuraton for
67 # grub1 around. Lets try to generate grub.cfg from it so user
68
69
70
71 1.168 sys-boot/grub/ChangeLog
72
73 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.168&view=markup
74 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.168&content-type=text/plain
75 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.167&r2=1.168
76
77 Index: ChangeLog
78 ===================================================================
79 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
80 retrieving revision 1.167
81 retrieving revision 1.168
82 diff -u -r1.167 -r1.168
83 --- ChangeLog 14 Sep 2011 17:57:08 -0000 1.167
84 +++ ChangeLog 3 Oct 2011 09:10:13 -0000 1.168
85 @@ -1,6 +1,10 @@
86 # ChangeLog for sys-boot/grub
87 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
88 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.167 2011/09/14 17:57:08 scarabeus Exp $
89 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.168 2011/10/03 09:10:13 scarabeus Exp $
90 +
91 + 03 Oct 2011; Tomáš Chvátal <scarabeus@g.o> grub-1.99-r2.ebuild,
92 + grub-9999.ebuild:
93 + Include minor fixes from Robert Trace <rtrace{at}farcaster.org>
94
95 14 Sep 2011; Tomáš Chvátal <scarabeus@g.o> grub-1.99-r2.ebuild,
96 grub-9999.ebuild:
97
98
99
100 1.43 sys-boot/grub/grub-9999.ebuild
101
102 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.43&view=markup
103 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.43&content-type=text/plain
104 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.42&r2=1.43
105
106 Index: grub-9999.ebuild
107 ===================================================================
108 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
109 retrieving revision 1.42
110 retrieving revision 1.43
111 diff -u -r1.42 -r1.43
112 --- grub-9999.ebuild 14 Sep 2011 17:57:08 -0000 1.42
113 +++ grub-9999.ebuild 3 Oct 2011 09:10:13 -0000 1.43
114 @@ -1,6 +1,6 @@
115 # Copyright 1999-2011 Gentoo Foundation
116 # Distributed under the terms of the GNU General Public License v2
117 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.42 2011/09/14 17:57:08 scarabeus Exp $
118 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.43 2011/10/03 09:10:13 scarabeus Exp $
119
120 EAPI=4
121
122 @@ -231,10 +231,10 @@
123 "bin/grub2-mkimage"
124 )
125 for e in ${PAX[@]}; do
126 - pax-mark -mpx "${ED}/${e}"
127 + pax-mark -mp "${ED}/${e}"
128 done
129
130 - # can't be in docs array as we use defualt_src_install in different builddir
131 + # can't be in docs array as we use default_src_install in different builddir
132 dodoc AUTHORS ChangeLog NEWS README THANKS TODO
133 insinto /etc/default
134 newins "${FILESDIR}"/grub.default grub
135 @@ -242,7 +242,7 @@
136 GRUB_DISTRIBUTOR="Gentoo"
137 EOF
138
139 - elog "Remember to run emerge --config =${CATEGORY}/${P} in order"
140 + elog "Remember to run emerge --config =${CATEGORY}/${PF} in order"
141 elog "to set up basic settings for this package."
142 }
143
144 @@ -250,9 +250,12 @@
145 local dir=$1
146
147 # display the link to guide
148 - elog "For informations how to configure grub-2 please reffer to the guide:"
149 + elog "For informations how to configure grub-2 please refer to the guide:"
150 elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
151
152 + # Make sure target directory exists
153 + mkdir -p "${dir}"
154 +
155 if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
156 # This is first grub2 install and we have old configuraton for
157 # grub1 around. Lets try to generate grub.cfg from it so user
Report Message
Find on MARC Find on Google Groups