1 |
floppym 12/03/06 00:58:38 |
2 |
|
3 |
Modified: grub-2.00_beta0.ebuild grub-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Don't use the platform to tranform the utility names; it's pointless. Users may need to specify the --target option if grub2-install fails to auto-detect it. |
6 |
|
7 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 sys-boot/grub/grub-2.00_beta0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00_beta0.ebuild?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00_beta0.ebuild?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00_beta0.ebuild?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: grub-2.00_beta0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta0.ebuild,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- grub-2.00_beta0.ebuild 4 Mar 2012 21:23:33 -0000 1.4 |
23 |
+++ grub-2.00_beta0.ebuild 6 Mar 2012 00:58:38 -0000 1.5 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2012 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta0.ebuild,v 1.4 2012/03/04 21:23:33 floppym Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta0.ebuild,v 1.5 2012/03/06 00:58:38 floppym Exp $ |
29 |
|
30 |
EAPI=4 |
31 |
|
32 |
@@ -114,15 +114,10 @@ |
33 |
grub_src_configure() { |
34 |
local platform=$1 |
35 |
local target |
36 |
- local transform="grub2" |
37 |
local with_platform |
38 |
|
39 |
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]" |
40 |
|
41 |
- if [[ ${platform} != "guessed" ]]; then |
42 |
- transform="grub2-${platform}" |
43 |
- fi |
44 |
- |
45 |
# check if we have to specify the target (EFI) |
46 |
# or just append correct --with-platform |
47 |
if [[ ${platform} == efi* ]]; then |
48 |
@@ -143,7 +138,7 @@ |
49 |
ECONF_SOURCE="${S}" \ |
50 |
econf \ |
51 |
--disable-werror \ |
52 |
- --program-transform-name="s,grub,${transform}," \ |
53 |
+ --program-transform-name="s,grub,grub2," \ |
54 |
--with-grubdir=grub2 \ |
55 |
$(use_enable debug mm-debug) \ |
56 |
$(use_enable debug grub-emu-usb) \ |
57 |
|
58 |
|
59 |
|
60 |
1.54 sys-boot/grub/grub-9999.ebuild |
61 |
|
62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.54&view=markup |
63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.54&content-type=text/plain |
64 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.53&r2=1.54 |
65 |
|
66 |
Index: grub-9999.ebuild |
67 |
=================================================================== |
68 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v |
69 |
retrieving revision 1.53 |
70 |
retrieving revision 1.54 |
71 |
diff -u -r1.53 -r1.54 |
72 |
--- grub-9999.ebuild 4 Mar 2012 21:23:33 -0000 1.53 |
73 |
+++ grub-9999.ebuild 6 Mar 2012 00:58:38 -0000 1.54 |
74 |
@@ -1,6 +1,6 @@ |
75 |
# Copyright 1999-2012 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.53 2012/03/04 21:23:33 floppym Exp $ |
78 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.54 2012/03/06 00:58:38 floppym Exp $ |
79 |
|
80 |
EAPI=4 |
81 |
|
82 |
@@ -114,15 +114,10 @@ |
83 |
grub_src_configure() { |
84 |
local platform=$1 |
85 |
local target |
86 |
- local transform="grub2" |
87 |
local with_platform |
88 |
|
89 |
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]" |
90 |
|
91 |
- if [[ ${platform} != "guessed" ]]; then |
92 |
- transform="grub2-${platform}" |
93 |
- fi |
94 |
- |
95 |
# check if we have to specify the target (EFI) |
96 |
# or just append correct --with-platform |
97 |
if [[ ${platform} == efi* ]]; then |
98 |
@@ -143,7 +138,7 @@ |
99 |
ECONF_SOURCE="${S}" \ |
100 |
econf \ |
101 |
--disable-werror \ |
102 |
- --program-transform-name="s,grub,${transform}," \ |
103 |
+ --program-transform-name="s,grub,grub2," \ |
104 |
--with-grubdir=grub2 \ |
105 |
$(use_enable debug mm-debug) \ |
106 |
$(use_enable debug grub-emu-usb) \ |
107 |
|
108 |
|
109 |
|
110 |
1.183 sys-boot/grub/ChangeLog |
111 |
|
112 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.183&view=markup |
113 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.183&content-type=text/plain |
114 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.182&r2=1.183 |
115 |
|
116 |
Index: ChangeLog |
117 |
=================================================================== |
118 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
119 |
retrieving revision 1.182 |
120 |
retrieving revision 1.183 |
121 |
diff -u -r1.182 -r1.183 |
122 |
--- ChangeLog 4 Mar 2012 21:23:33 -0000 1.182 |
123 |
+++ ChangeLog 6 Mar 2012 00:58:38 -0000 1.183 |
124 |
@@ -1,6 +1,12 @@ |
125 |
# ChangeLog for sys-boot/grub |
126 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
127 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.182 2012/03/04 21:23:33 floppym Exp $ |
128 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.183 2012/03/06 00:58:38 floppym Exp $ |
129 |
+ |
130 |
+ 06 Mar 2012; Mike Gilbert <floppym@g.o> grub-2.00_beta0.ebuild, |
131 |
+ grub-9999.ebuild: |
132 |
+ Don't use the platform to tranform the utility names; it's pointless. Users |
133 |
+ may need to specify the --target option if grub2-install fails to auto-detect |
134 |
+ it. |
135 |
|
136 |
04 Mar 2012; Mike Gilbert <floppym@g.o> grub-2.00_beta0.ebuild, |
137 |
grub-9999.ebuild: |