1 |
zzam 07/09/25 08:50:47 |
2 |
|
3 |
Modified: ChangeLog udev-115-r6.ebuild |
4 |
Log: |
5 |
Cleanup of ebuild style. |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.353 sys-fs/udev/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.353&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.353&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.352&r2=1.353 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v |
18 |
retrieving revision 1.352 |
19 |
retrieving revision 1.353 |
20 |
diff -u -r1.352 -r1.353 |
21 |
--- ChangeLog 24 Sep 2007 19:59:37 -0000 1.352 |
22 |
+++ ChangeLog 25 Sep 2007 08:50:47 -0000 1.353 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for sys-fs/udev |
25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.352 2007/09/24 19:59:37 zzam Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.353 2007/09/25 08:50:47 zzam Exp $ |
28 |
+ |
29 |
+ 25 Sep 2007; Matthias Schwarzott <zzam@g.o> udev-115-r6.ebuild: |
30 |
+ Cleanup of ebuild style. |
31 |
|
32 |
*udev-115-r6 (24 Sep 2007) |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.2 sys-fs/udev/udev-115-r6.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-115-r6.ebuild?rev=1.2&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-115-r6.ebuild?rev=1.2&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-115-r6.ebuild?r1=1.1&r2=1.2 |
42 |
|
43 |
Index: udev-115-r6.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r6.ebuild,v |
46 |
retrieving revision 1.1 |
47 |
retrieving revision 1.2 |
48 |
diff -u -r1.1 -r1.2 |
49 |
--- udev-115-r6.ebuild 24 Sep 2007 19:59:37 -0000 1.1 |
50 |
+++ udev-115-r6.ebuild 25 Sep 2007 08:50:47 -0000 1.2 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2007 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r6.ebuild,v 1.1 2007/09/24 19:59:37 zzam Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-115-r6.ebuild,v 1.2 2007/09/25 08:50:47 zzam Exp $ |
56 |
|
57 |
inherit eutils flag-o-matic multilib toolchain-funcs versionator |
58 |
|
59 |
@@ -52,11 +52,13 @@ |
60 |
local KV_MICRO=$(get_version_component_range 3 ${KV}) |
61 |
|
62 |
local ok=0 |
63 |
- if [[ "${KV_MAJOR}" == 2 ]] && [[ "${KV_MINOR}" == 6 ]] && [[ "${KV_MICRO}" -ge 15 ]]; then |
64 |
+ if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 && ${KV_MICRO} -ge 15 ]] |
65 |
+ then |
66 |
ok=1 |
67 |
fi |
68 |
|
69 |
- if [[ "$ok" = "0" ]]; then |
70 |
+ if [[ ${ok} == 0 ]] |
71 |
+ then |
72 |
ewarn |
73 |
ewarn "${P} does not support Linux kernel before version 2.6.15!" |
74 |
ewarn "If you want to use udev you need to update" |
75 |
@@ -95,9 +97,9 @@ |
76 |
|
77 |
# Make sure there is no sudden changes to upstream rules file |
78 |
# (more for my own needs than anything else ...) |
79 |
- MD5=`md5sum < "${S}/etc/udev/rules.d/50-udev-default.rules"` |
80 |
+ MD5=$(md5sum < "${S}/etc/udev/rules.d/50-udev-default.rules") |
81 |
MD5=${MD5/ -/} |
82 |
- if [ "${MD5}" != "644e3c77eb866dee4ff8dda2e95cd187" ] |
83 |
+ if [[ ${MD5} != 644e3c77eb866dee4ff8dda2e95cd187 ]] |
84 |
then |
85 |
echo |
86 |
eerror "50-udev-default.rules has been updated, please validate!" |
87 |
@@ -127,7 +129,7 @@ |
88 |
libudevdir=${udev_helper_dir} \ |
89 |
CROSS_COMPILE=${mycross} \ |
90 |
OPTFLAGS="" \ |
91 |
- ${myconf} || die |
92 |
+ ${myconf} || die "compiling udev failed" |
93 |
} |
94 |
|
95 |
src_install() { |
96 |
@@ -137,7 +139,7 @@ |
97 |
libudevdir=${udev_helper_dir} \ |
98 |
EXTRAS="${extras}" \ |
99 |
${myconf} \ |
100 |
- install || die |
101 |
+ install || die "make install failed" |
102 |
|
103 |
# make install does not install this |
104 |
dosbin udevstart || die "Required binary not installed properly" |
105 |
@@ -179,7 +181,8 @@ |
106 |
doins packages/40-alsa.rules |
107 |
|
108 |
# Adding arch specific rules |
109 |
- if [[ -f "packages/40-${ARCH}.rules" ]]; then |
110 |
+ if [[ -f packages/40-${ARCH}.rules ]] |
111 |
+ then |
112 |
doins "packages/40-${ARCH}.rules" |
113 |
fi |
114 |
cd "${S}" |
115 |
@@ -193,8 +196,8 @@ |
116 |
newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount |
117 |
|
118 |
insinto /etc/modprobe.d |
119 |
- newins ${FILESDIR}/blacklist-110 blacklist |
120 |
- doins ${FILESDIR}/pnp-aliases |
121 |
+ newins "${FILESDIR}"/blacklist-110 blacklist |
122 |
+ doins "${FILESDIR}"/pnp-aliases |
123 |
|
124 |
# convert /lib/udev to real used dir |
125 |
sed_helper_dir \ |
126 |
@@ -214,38 +217,39 @@ |
127 |
} |
128 |
|
129 |
pkg_preinst() { |
130 |
- if [[ -d "${ROOT}"/lib/udev-state ]] ; then |
131 |
+ if [[ -d ${ROOT}/lib/udev-state ]] |
132 |
+ then |
133 |
mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ |
134 |
rm -r "${ROOT}"/lib/udev-state |
135 |
fi |
136 |
|
137 |
- if [ -f "${ROOT}/etc/udev/udev.config" -a \ |
138 |
- ! -f "${ROOT}/etc/udev/udev.rules" ] |
139 |
+ if [[ -f ${ROOT}/etc/udev/udev.config && |
140 |
+ ! -f ${ROOT}/etc/udev/udev.rules ]] |
141 |
then |
142 |
mv -f "${ROOT}"/etc/udev/udev.config "${ROOT}"/etc/udev/udev.rules |
143 |
fi |
144 |
|
145 |
# delete the old udev.hotplug symlink if it is present |
146 |
- if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ] |
147 |
+ if [[ -h ${ROOT}/etc/hotplug.d/default/udev.hotplug ]] |
148 |
then |
149 |
rm -f "${ROOT}"/etc/hotplug.d/default/udev.hotplug |
150 |
fi |
151 |
|
152 |
# delete the old wait_for_sysfs.hotplug symlink if it is present |
153 |
- if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ] |
154 |
+ if [[ -h ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]] |
155 |
then |
156 |
rm -f "${ROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug |
157 |
fi |
158 |
|
159 |
# delete the old wait_for_sysfs.hotplug symlink if it is present |
160 |
- if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ] |
161 |
+ if [[ -h ${ROOT}/etc/hotplug.d/default/10-udev.hotplug ]] |
162 |
then |
163 |
rm -f "${ROOT}"/etc/hotplug.d/default/10-udev.hotplug |
164 |
fi |
165 |
|
166 |
# is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind) |
167 |
coldplug_stale="" |
168 |
- if [ -f "${ROOT}/etc/init.d/coldplug" ] |
169 |
+ if [[ -f ${ROOT}/etc/init.d/coldplug ]] |
170 |
then |
171 |
coldplug_stale="1" |
172 |
fi |
173 |
@@ -255,7 +259,8 @@ |
174 |
# people want reminders, I'll give them reminders. Odds are they will |
175 |
# just ignore them anyway... |
176 |
|
177 |
- if [[ ${coldplug_stale} == "1" ]] ; then |
178 |
+ if [[ ${coldplug_stale} == 1 ]] |
179 |
+ then |
180 |
ewarn "A stale coldplug init script found. You should run:" |
181 |
ewarn |
182 |
ewarn " rc-update del coldplug" |
183 |
@@ -265,36 +270,39 @@ |
184 |
fi |
185 |
|
186 |
# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules |
187 |
- if has_version "=sys-fs/udev-103-r3"; then |
188 |
- if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] |
189 |
- then |
190 |
- ewarn "Deleting stray 40-scsi-hotplug.rules" |
191 |
- ewarn "installed by sys-fs/udev-103-r3" |
192 |
- rm -f "${ROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules |
193 |
- fi |
194 |
+ if has_version "=sys-fs/udev-103-r3" && |
195 |
+ [[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]] |
196 |
+ then |
197 |
+ ewarn "Deleting stray 40-scsi-hotplug.rules" |
198 |
+ ewarn "installed by sys-fs/udev-103-r3" |
199 |
+ rm -f "${ROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules |
200 |
fi |
201 |
|
202 |
# Removing some device-nodes we thought we need some time ago |
203 |
- if [[ -d "${ROOT}"/lib/udev/devices ]]; then |
204 |
+ if [[ -d ${ROOT}/lib/udev/devices ]] |
205 |
+ then |
206 |
rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} |
207 |
fi |
208 |
|
209 |
# Removing some old file |
210 |
- if has_version "<sys-fs/udev-104-r5"; then |
211 |
+ if has_version "<sys-fs/udev-104-r5" |
212 |
+ then |
213 |
rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev |
214 |
rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null |
215 |
fi |
216 |
|
217 |
- if has_version "<sys-fs/udev-106-r5"; then |
218 |
- if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then |
219 |
- rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules |
220 |
- fi |
221 |
+ if has_version "<sys-fs/udev-106-r5" && |
222 |
+ [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]] |
223 |
+ then |
224 |
+ rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules |
225 |
fi |
226 |
|
227 |
# Try to remove /etc/dev.d as that is obsolete |
228 |
- if [[ -d "${ROOT}"/etc/dev.d ]]; then |
229 |
+ if [[ -d ${ROOT}/etc/dev.d ]] |
230 |
+ then |
231 |
rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null |
232 |
- if [[ -d "${ROOT}"/etc/dev.d ]]; then |
233 |
+ if [[ -d ${ROOT}/etc/dev.d ]] |
234 |
+ then |
235 |
ewarn "You still have the directory /etc/dev.d on your system." |
236 |
ewarn "This is no longer used by udev and can be removed." |
237 |
fi |
238 |
@@ -303,18 +311,21 @@ |
239 |
# 64-device-mapper.rules now gets installed by sys-fs/device-mapper |
240 |
# remove it if user don't has sys-fs/device-mapper installed |
241 |
if has_version "<sys-fs/udev-113" && |
242 |
- [[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] && |
243 |
+ [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && |
244 |
! has_version sys-fs/device-mapper |
245 |
then |
246 |
rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules |
247 |
einfo "Removed unneeded file 64-device-mapper.rules" |
248 |
fi |
249 |
|
250 |
- if [[ "${ROOT}" == "/" ]] ; then |
251 |
+ if [[ ${ROOT} == / ]] |
252 |
+ then |
253 |
# check if root of init-process is identical to ours |
254 |
- if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then |
255 |
+ if [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] |
256 |
+ then |
257 |
einfo "restarting udevd now." |
258 |
- if [[ -n $(pidof udevd) ]] ; then |
259 |
+ if [[ -n $(pidof udevd) ]] |
260 |
+ then |
261 |
killall -15 udevd &>/dev/null |
262 |
sleep 1 |
263 |
killall -9 udevd &>/dev/null |
264 |
|
265 |
|
266 |
|
267 |
-- |
268 |
gentoo-commits@g.o mailing list |