1 |
spock 09/03/22 21:30:38 |
2 |
|
3 |
Modified: memtest86-3.3.ebuild ChangeLog memtest86-3.4.ebuild |
4 |
Log: |
5 |
Fix bug #260547 (drop the /etc/fstab -> GRUB translation code). |
6 |
(Portage version: 2.1.6.9/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.4 sys-apps/memtest86/memtest86-3.3.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild?rev=1.4&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild?rev=1.4&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild?r1=1.3&r2=1.4 |
14 |
|
15 |
Index: memtest86-3.3.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild,v |
18 |
retrieving revision 1.3 |
19 |
retrieving revision 1.4 |
20 |
diff -u -r1.3 -r1.4 |
21 |
--- memtest86-3.3.ebuild 13 Oct 2007 14:14:52 -0000 1.3 |
22 |
+++ memtest86-3.3.ebuild 22 Mar 2009 21:30:38 -0000 1.4 |
23 |
@@ -1,6 +1,6 @@ |
24 |
-# Copyright 1999-2007 Gentoo Foundation |
25 |
+# Copyright 1999-2009 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild,v 1.3 2007/10/13 14:14:52 angelos Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild,v 1.4 2009/03/22 21:30:38 spock Exp $ |
29 |
|
30 |
inherit mount-boot eutils |
31 |
|
32 |
@@ -43,30 +43,10 @@ |
33 |
einfo "memtest.bin has been installed in /boot/memtest86/" |
34 |
einfo "You may wish to update your bootloader configs" |
35 |
einfo "by adding these lines:" |
36 |
- einfo " - For grub:" |
37 |
+ einfo " - For grub: (replace '?' with correct numbers for your boot partition)" |
38 |
+ einfo " > root (hd?,?)" |
39 |
einfo " > title=Memtest86" |
40 |
- |
41 |
- # a little magic to make users' life as easy as possible ;) |
42 |
- bootpart=0 |
43 |
- root="(hd0,0)" |
44 |
- res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'` |
45 |
- if [ -n "${res}" ] ; then |
46 |
- bootpart=1 |
47 |
- else |
48 |
- res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'` |
49 |
- fi |
50 |
- |
51 |
- if [ -n "${res}" ] ; then |
52 |
- root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'` |
53 |
- fi |
54 |
- |
55 |
- einfo " > root ${root}" |
56 |
- if [ "${bootpart}" -eq 1 ] ; then |
57 |
- einfo " > kernel /memtest86/memtest.bin" |
58 |
- else |
59 |
- einfo " > kernel /boot/memtest86/memtest.bin" |
60 |
- fi |
61 |
- |
62 |
+ einfo " > kernel /boot/memtest86/memtest.bin" |
63 |
einfo " - For lilo:" |
64 |
einfo " > image = /boot/memtest86/memtest.bin" |
65 |
einfo " > label = Memtest86" |
66 |
|
67 |
|
68 |
|
69 |
1.35 sys-apps/memtest86/ChangeLog |
70 |
|
71 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/ChangeLog?rev=1.35&view=markup |
72 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/ChangeLog?rev=1.35&content-type=text/plain |
73 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/ChangeLog?r1=1.34&r2=1.35 |
74 |
|
75 |
Index: ChangeLog |
76 |
=================================================================== |
77 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v |
78 |
retrieving revision 1.34 |
79 |
retrieving revision 1.35 |
80 |
diff -u -r1.34 -r1.35 |
81 |
--- ChangeLog 28 Sep 2008 11:01:23 -0000 1.34 |
82 |
+++ ChangeLog 22 Mar 2009 21:30:38 -0000 1.35 |
83 |
@@ -1,6 +1,10 @@ |
84 |
# ChangeLog for sys-apps/memtest86 |
85 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
86 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.34 2008/09/28 11:01:23 spock Exp $ |
87 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
88 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.35 2009/03/22 21:30:38 spock Exp $ |
89 |
+ |
90 |
+ 22 Mar 2009; Michał Januszewski <spock@g.o> memtest86-3.3.ebuild, |
91 |
+ memtest86-3.4.ebuild: |
92 |
+ Fix bug #260547 (drop the /etc/fstab -> GRUB translation code). |
93 |
|
94 |
28 Sep 2008; Michał Januszewski <spock@g.o> Manifest: |
95 |
Compile memtest86+ with -O1 instead of -Os (bug #217324). |
96 |
|
97 |
|
98 |
|
99 |
1.2 sys-apps/memtest86/memtest86-3.4.ebuild |
100 |
|
101 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild?rev=1.2&view=markup |
102 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild?rev=1.2&content-type=text/plain |
103 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild?r1=1.1&r2=1.2 |
104 |
|
105 |
Index: memtest86-3.4.ebuild |
106 |
=================================================================== |
107 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild,v |
108 |
retrieving revision 1.1 |
109 |
retrieving revision 1.2 |
110 |
diff -u -r1.1 -r1.2 |
111 |
--- memtest86-3.4.ebuild 19 Jan 2008 22:10:59 -0000 1.1 |
112 |
+++ memtest86-3.4.ebuild 22 Mar 2009 21:30:38 -0000 1.2 |
113 |
@@ -1,6 +1,6 @@ |
114 |
-# Copyright 1999-2008 Gentoo Foundation |
115 |
+# Copyright 1999-2009 Gentoo Foundation |
116 |
# Distributed under the terms of the GNU General Public License v2 |
117 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild,v 1.1 2008/01/19 22:10:59 vapier Exp $ |
118 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild,v 1.2 2009/03/22 21:30:38 spock Exp $ |
119 |
|
120 |
inherit mount-boot eutils |
121 |
|
122 |
@@ -43,30 +43,10 @@ |
123 |
einfo "memtest.bin has been installed in /boot/memtest86/" |
124 |
einfo "You may wish to update your bootloader configs" |
125 |
einfo "by adding these lines:" |
126 |
- einfo " - For grub:" |
127 |
+ einfo " - For grub: (replace '?' with correct numbers for your boot partition)" |
128 |
einfo " > title=Memtest86" |
129 |
- |
130 |
- # a little magic to make users' life as easy as possible ;) |
131 |
- bootpart=0 |
132 |
- root="(hd0,0)" |
133 |
- res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'` |
134 |
- if [ -n "${res}" ] ; then |
135 |
- bootpart=1 |
136 |
- else |
137 |
- res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'` |
138 |
- fi |
139 |
- |
140 |
- if [ -n "${res}" ] ; then |
141 |
- root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'` |
142 |
- fi |
143 |
- |
144 |
- einfo " > root ${root}" |
145 |
- if [ "${bootpart}" -eq 1 ] ; then |
146 |
- einfo " > kernel /memtest86/memtest.bin" |
147 |
- else |
148 |
- einfo " > kernel /boot/memtest86/memtest.bin" |
149 |
- fi |
150 |
- |
151 |
+ einfo " > root (hd?,?)" |
152 |
+ einfo " > kernel /boot/memtest86/memtest.bin" |
153 |
einfo " - For lilo:" |
154 |
einfo " > image = /boot/memtest86/memtest.bin" |
155 |
einfo " > label = Memtest86" |