Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/udev: udev-125-r2.ebuild udev-124-r1.ebuild udev-130-r1.ebuild udev-133.ebuild ChangeLog udev-122-r1.ebuild
Date: Fri, 28 Nov 2008 12:51:57
Message-Id: E1L62p8-000318-Py@stork.gentoo.org
1 zzam 08/11/28 12:51:54
2
3 Modified: udev-125-r2.ebuild udev-124-r1.ebuild
4 udev-130-r1.ebuild udev-133.ebuild ChangeLog
5 udev-122-r1.ebuild
6 Log:
7 Do only recommend to reboot instead of trigger for re-creating persistent-rules, suggested by Kay Sievers. Cleanup some messages.
8 (Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r1 i686)
9
10 Revision Changes Path
11 1.2 sys-fs/udev/udev-125-r2.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-125-r2.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-125-r2.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-125-r2.ebuild?r1=1.1&r2=1.2
16
17 Index: udev-125-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-125-r2.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- udev-125-r2.ebuild 3 Aug 2008 11:45:45 -0000 1.1
24 +++ udev-125-r2.ebuild 28 Nov 2008 12:51:54 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2008 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-125-r2.ebuild,v 1.1 2008/08/03 11:45:45 zzam Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-125-r2.ebuild,v 1.2 2008/11/28 12:51:54 zzam Exp $
30
31 inherit eutils flag-o-matic multilib toolchain-funcs versionator
32
33 @@ -334,14 +334,12 @@
34 # requested in Bug #225033:
35 elog
36 elog "persistent-net does assigning fixed names to network devices."
37 - elog "If you have problems with persistent-net rules,"
38 + elog "If you have problems with the persistent-net rules,"
39 elog "just delete the rules file"
40 elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
41 - elog "and then trigger udev by either running"
42 - elog "\tudevadm trigger --subsystem-match=net"
43 - elog "or by rebooting."
44 + elog "and then reboot."
45 elog
46 - elog "This may number your devices in a different way than it is now."
47 + elog "This may however number your devices in a different way than they are now."
48
49 if [[ ${ROOT} == / ]]
50 then
51
52
53
54 1.10 sys-fs/udev/udev-124-r1.ebuild
55
56 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild?rev=1.10&view=markup
57 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild?rev=1.10&content-type=text/plain
58 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild?r1=1.9&r2=1.10
59
60 Index: udev-124-r1.ebuild
61 ===================================================================
62 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild,v
63 retrieving revision 1.9
64 retrieving revision 1.10
65 diff -u -r1.9 -r1.10
66 --- udev-124-r1.ebuild 27 Oct 2008 06:02:27 -0000 1.9
67 +++ udev-124-r1.ebuild 28 Nov 2008 12:51:54 -0000 1.10
68 @@ -1,6 +1,6 @@
69 # Copyright 1999-2008 Gentoo Foundation
70 # Distributed under the terms of the GNU General Public License v2
71 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild,v 1.9 2008/10/27 06:02:27 vapier Exp $
72 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild,v 1.10 2008/11/28 12:51:54 zzam Exp $
73
74 inherit eutils flag-o-matic multilib toolchain-funcs versionator
75
76 @@ -335,14 +335,12 @@
77 # requested in Bug #225033:
78 elog
79 elog "persistent-net does assigning fixed names to network devices."
80 - elog "If you have problems with persistent-net rules,"
81 + elog "If you have problems with the persistent-net rules,"
82 elog "just delete the rules file"
83 elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
84 - elog "and then trigger udev by either running"
85 - elog "\tudevadm trigger --subsystem-match=net"
86 - elog "or by rebooting."
87 + elog "and then reboot."
88 elog
89 - elog "This may number your devices in a different way than it is now."
90 + elog "This may however number your devices in a different way than they are now."
91
92 if [[ ${ROOT} == / ]]
93 then
94
95
96
97 1.2 sys-fs/udev/udev-130-r1.ebuild
98
99 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-130-r1.ebuild?rev=1.2&view=markup
100 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-130-r1.ebuild?rev=1.2&content-type=text/plain
101 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-130-r1.ebuild?r1=1.1&r2=1.2
102
103 Index: udev-130-r1.ebuild
104 ===================================================================
105 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-130-r1.ebuild,v
106 retrieving revision 1.1
107 retrieving revision 1.2
108 diff -u -r1.1 -r1.2
109 --- udev-130-r1.ebuild 9 Oct 2008 08:56:42 -0000 1.1
110 +++ udev-130-r1.ebuild 28 Nov 2008 12:51:54 -0000 1.2
111 @@ -1,6 +1,6 @@
112 # Copyright 1999-2008 Gentoo Foundation
113 # Distributed under the terms of the GNU General Public License v2
114 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-130-r1.ebuild,v 1.1 2008/10/09 08:56:42 zzam Exp $
115 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-130-r1.ebuild,v 1.2 2008/11/28 12:51:54 zzam Exp $
116
117 inherit eutils flag-o-matic multilib toolchain-funcs versionator autotools
118
119 @@ -292,14 +292,12 @@
120 # requested in Bug #225033:
121 elog
122 elog "persistent-net does assigning fixed names to network devices."
123 - elog "If you have problems with persistent-net rules,"
124 + elog "If you have problems with the persistent-net rules,"
125 elog "just delete the rules file"
126 elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
127 - elog "and then trigger udev by either running"
128 - elog "\tudevadm trigger --subsystem-match=net"
129 - elog "or by rebooting."
130 + elog "and then reboot."
131 elog
132 - elog "This may number your devices in a different way than it is now."
133 + elog "This may however number your devices in a different way than they are now."
134
135 if [[ ${ROOT} == / ]]
136 then
137
138
139
140 1.6 sys-fs/udev/udev-133.ebuild
141
142 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-133.ebuild?rev=1.6&view=markup
143 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-133.ebuild?rev=1.6&content-type=text/plain
144 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-133.ebuild?r1=1.5&r2=1.6
145
146 Index: udev-133.ebuild
147 ===================================================================
148 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-133.ebuild,v
149 retrieving revision 1.5
150 retrieving revision 1.6
151 diff -u -r1.5 -r1.6
152 --- udev-133.ebuild 25 Nov 2008 19:32:53 -0000 1.5
153 +++ udev-133.ebuild 28 Nov 2008 12:51:54 -0000 1.6
154 @@ -1,6 +1,6 @@
155 # Copyright 1999-2008 Gentoo Foundation
156 # Distributed under the terms of the GNU General Public License v2
157 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-133.ebuild,v 1.5 2008/11/25 19:32:53 zzam Exp $
158 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-133.ebuild,v 1.6 2008/11/28 12:51:54 zzam Exp $
159
160 inherit eutils flag-o-matic multilib toolchain-funcs versionator
161
162 @@ -301,7 +301,8 @@
163 local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules
164 [[ -f ${rules} ]] || return
165
166 - ebegin "Fixing persistent-net rules file"
167 + elog
168 + elog "Updating persistent-net rules file"
169
170 # Change ATTRS to ATTR matches, Bug #246927
171 sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
172 @@ -310,8 +311,6 @@
173 sed -ri \
174 -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
175 "${rules}"
176 -
177 - eend 0 ""
178 }
179
180 # See Bug #129204 for a discussion about restarting udevd
181 @@ -330,7 +329,6 @@
182
183 elog
184 elog "restarting udevd now."
185 - elog
186
187 killall -15 udevd &>/dev/null
188 sleep 1
189 @@ -340,6 +338,15 @@
190 }
191
192 pkg_postinst() {
193 + fix_old_persistent_net_rules
194 +
195 + restart_udevd
196 +
197 + if [[ $previous_less_than_133 = 0 ]]
198 + then
199 + enable_udev_init_script
200 + fi
201 +
202 # people want reminders, I'll give them reminders. Odds are they will
203 # just ignore them anyway...
204
205 @@ -405,19 +412,14 @@
206 # requested in Bug #225033:
207 elog
208 elog "persistent-net does assigning fixed names to network devices."
209 - elog "If you have problems with persistent-net rules,"
210 + elog "If you have problems with the persistent-net rules,"
211 elog "just delete the rules file"
212 elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
213 - elog "and then trigger udev by either running"
214 - elog "\tudevadm trigger --subsystem-match=net"
215 - elog "or by rebooting."
216 + elog "and then reboot."
217 elog
218 - elog "This may number your devices in a different way than it is now."
219 -
220 - fix_old_persistent_net_rules
221 -
222 - restart_udevd
223 + elog "This may however number your devices in a different way than they are now."
224
225 + ewarn
226 ewarn "If you build an initramfs including udev, then please"
227 ewarn "make sure that the /sbin/udevadm binary gets included,"
228 ewarn "and your scripts changed to use it,as it replaces the"
229 @@ -428,11 +430,6 @@
230 ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
231 ewarn "as for other directories."
232
233 - if [[ $previous_less_than_133 = 0 ]]
234 - then
235 - enable_udev_init_script
236 - fi
237 -
238 elog
239 elog "For more information on udev on Gentoo, writing udev rules, and"
240 elog " fixing known issues visit:"
241
242
243
244 1.423 sys-fs/udev/ChangeLog
245
246 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.423&view=markup
247 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.423&content-type=text/plain
248 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.422&r2=1.423
249
250 Index: ChangeLog
251 ===================================================================
252 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
253 retrieving revision 1.422
254 retrieving revision 1.423
255 diff -u -r1.422 -r1.423
256 --- ChangeLog 26 Nov 2008 06:53:35 -0000 1.422
257 +++ ChangeLog 28 Nov 2008 12:51:54 -0000 1.423
258 @@ -1,6 +1,12 @@
259 # ChangeLog for sys-fs/udev
260 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
261 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.422 2008/11/26 06:53:35 zzam Exp $
262 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.423 2008/11/28 12:51:54 zzam Exp $
263 +
264 + 28 Nov 2008; Matthias Schwarzott <zzam@g.o> udev-122-r1.ebuild,
265 + udev-124-r1.ebuild, udev-125-r2.ebuild, udev-130-r1.ebuild,
266 + udev-133.ebuild:
267 + Do only recommend to reboot instead of trigger for re-creating
268 + persistent-rules, suggested by Kay Sievers. Cleanup some messages.
269
270 26 Nov 2008; Matthias Schwarzott <zzam@g.o> -udev-130-r2.ebuild,
271 -udev-132.ebuild:
272
273
274
275 1.3 sys-fs/udev/udev-122-r1.ebuild
276
277 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild?rev=1.3&view=markup
278 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild?rev=1.3&content-type=text/plain
279 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild?r1=1.2&r2=1.3
280
281 Index: udev-122-r1.ebuild
282 ===================================================================
283 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild,v
284 retrieving revision 1.2
285 retrieving revision 1.3
286 diff -u -r1.2 -r1.3
287 --- udev-122-r1.ebuild 15 Jun 2008 05:54:32 -0000 1.2
288 +++ udev-122-r1.ebuild 28 Nov 2008 12:51:54 -0000 1.3
289 @@ -1,6 +1,6 @@
290 # Copyright 1999-2008 Gentoo Foundation
291 # Distributed under the terms of the GNU General Public License v2
292 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild,v 1.2 2008/06/15 05:54:32 zmedico Exp $
293 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122-r1.ebuild,v 1.3 2008/11/28 12:51:54 zzam Exp $
294
295 inherit eutils flag-o-matic multilib toolchain-funcs versionator
296
297 @@ -334,14 +334,12 @@
298 # requested in Bug #225033:
299 elog
300 elog "persistent-net does assigning fixed names to network devices."
301 - elog "If you have problems with persistent-net rules,"
302 + elog "If you have problems with the persistent-net rules,"
303 elog "just delete the rules file"
304 elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
305 - elog "and then trigger udev by either running"
306 - elog "\tudevadm trigger --subsystem-match=net"
307 - elog "or by rebooting."
308 + elog "and then reboot."
309 elog
310 - elog "This may number your devices in a different way than it is now."
311 + elog "This may however number your devices in a different way than they are now."
312
313 if [[ ${ROOT} == / ]]
314 then