1 |
ssuominen 14/03/02 17:55:48 |
2 |
|
3 |
Modified: udev-210.ebuild udev-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Use ROOT variable consitently everywhere. Thanks to floppym for pointing it out, from systemd's ebuild |
6 |
|
7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
8 |
|
9 |
Revision Changes Path |
10 |
1.8 sys-fs/udev/udev-210.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-210.ebuild?rev=1.8&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-210.ebuild?rev=1.8&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-210.ebuild?r1=1.7&r2=1.8 |
15 |
|
16 |
Index: udev-210.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v |
19 |
retrieving revision 1.7 |
20 |
retrieving revision 1.8 |
21 |
diff -u -r1.7 -r1.8 |
22 |
--- udev-210.ebuild 2 Mar 2014 14:04:51 -0000 1.7 |
23 |
+++ udev-210.ebuild 2 Mar 2014 17:55:48 -0000 1.8 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2014 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v 1.7 2014/03/02 14:04:51 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v 1.8 2014/03/02 17:55:48 ssuominen Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
@@ -383,8 +383,8 @@ |
33 |
pkg_preinst() { |
34 |
local htmldir |
35 |
for htmldir in gudev libudev; do |
36 |
- if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]; then |
37 |
- rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir} |
38 |
+ if [[ -d ${ROOT%/}/usr/share/gtk-doc/html/${htmldir} ]]; then |
39 |
+ rm -rf "${ROOT%/}"/usr/share/gtk-doc/html/${htmldir} |
40 |
fi |
41 |
if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then |
42 |
dosym ../../doc/${PF}/html/${htmldir} \ |
43 |
@@ -394,17 +394,17 @@ |
44 |
} |
45 |
|
46 |
pkg_postinst() { |
47 |
- mkdir -p "${ROOT}"run |
48 |
+ mkdir -p "${ROOT%/}"/run |
49 |
|
50 |
# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 |
51 |
# So try to remove it here (will only work if empty). |
52 |
- rmdir "${ROOT}"dev/loop 2>/dev/null |
53 |
- if [[ -d ${ROOT}dev/loop ]]; then |
54 |
+ rmdir "${ROOT%/}"/dev/loop 2>/dev/null |
55 |
+ if [[ -d ${ROOT%/}/dev/loop ]]; then |
56 |
ewarn "Please make sure your remove /dev/loop," |
57 |
ewarn "else losetup may be confused when looking for unused devices." |
58 |
fi |
59 |
|
60 |
- local fstab="${ROOT}"etc/fstab dev path fstype rest |
61 |
+ local fstab="${ROOT%/}"/etc/fstab dev path fstype rest |
62 |
while read -r dev path fstype rest; do |
63 |
if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then |
64 |
ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" |
65 |
@@ -413,7 +413,7 @@ |
66 |
fi |
67 |
done < "${fstab}" |
68 |
|
69 |
- if [[ -d ${ROOT}usr/lib/udev ]]; then |
70 |
+ if [[ -d ${ROOT%/}/usr/lib/udev ]]; then |
71 |
ewarn |
72 |
ewarn "Please re-emerge all packages on your system which install" |
73 |
ewarn "rules and helpers in /usr/lib/udev. They should now be in" |
74 |
@@ -424,8 +424,8 @@ |
75 |
ewarn "Note that qfile can be found in app-portage/portage-utils" |
76 |
fi |
77 |
|
78 |
- local old_cd_rules="${ROOT}"etc/udev/rules.d/70-persistent-cd.rules |
79 |
- local old_net_rules="${ROOT}"etc/udev/rules.d/70-persistent-net.rules |
80 |
+ local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules |
81 |
+ local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules |
82 |
for old_rules in "${old_cd_rules}" "${old_net_rules}"; do |
83 |
if [[ -f ${old_rules} ]]; then |
84 |
ewarn |
85 |
@@ -449,7 +449,7 @@ |
86 |
elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" |
87 |
elog "to disable the feature." |
88 |
|
89 |
- if has_version sys-apps/biosdevname; then |
90 |
+ if has_version 'sys-apps/biosdevname'; then |
91 |
ewarn |
92 |
ewarn "You can replace the functionality of sys-apps/biosdevname which has been" |
93 |
ewarn "detected to be installed with the new predictable network interface names." |
94 |
@@ -474,7 +474,7 @@ |
95 |
# do the same for 80-net-setup-link.rules to keep the old behavior |
96 |
local net_move=no |
97 |
local net_name_slot_sym=no |
98 |
- local net_rules_path="${ROOT}"/etc/udev/rules.d |
99 |
+ local net_rules_path="${ROOT%/}"/etc/udev/rules.d |
100 |
local net_name_slot="${net_rules_path}"/80-net-name-slot.rules |
101 |
local net_setup_link="${net_rules_path}"/80-net-setup-link.rules |
102 |
if [[ -e ${net_setup_link} ]]; then |
103 |
@@ -487,7 +487,7 @@ |
104 |
fi |
105 |
fi |
106 |
if [[ ${net_move} == yes ]]; then |
107 |
- ebegin "Because empty ${net_name_slot} was detected, we're adding ${net_setup_link}" |
108 |
+ ebegin "Copying ${net_name_slot} to ${net_setup_link}" |
109 |
|
110 |
if [[ ${net_name_slot_sym} == yes ]]; then |
111 |
ln -nfs /dev/null "${net_setup_link}" |
112 |
|
113 |
|
114 |
|
115 |
1.277 sys-fs/udev/udev-9999.ebuild |
116 |
|
117 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.277&view=markup |
118 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.277&content-type=text/plain |
119 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.276&r2=1.277 |
120 |
|
121 |
Index: udev-9999.ebuild |
122 |
=================================================================== |
123 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v |
124 |
retrieving revision 1.276 |
125 |
retrieving revision 1.277 |
126 |
diff -u -r1.276 -r1.277 |
127 |
--- udev-9999.ebuild 2 Mar 2014 14:04:51 -0000 1.276 |
128 |
+++ udev-9999.ebuild 2 Mar 2014 17:55:48 -0000 1.277 |
129 |
@@ -1,6 +1,6 @@ |
130 |
# Copyright 1999-2014 Gentoo Foundation |
131 |
# Distributed under the terms of the GNU General Public License v2 |
132 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.276 2014/03/02 14:04:51 ssuominen Exp $ |
133 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.277 2014/03/02 17:55:48 ssuominen Exp $ |
134 |
|
135 |
EAPI=5 |
136 |
|
137 |
@@ -384,8 +384,8 @@ |
138 |
pkg_preinst() { |
139 |
local htmldir |
140 |
for htmldir in gudev libudev; do |
141 |
- if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]; then |
142 |
- rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir} |
143 |
+ if [[ -d ${ROOT%/}/usr/share/gtk-doc/html/${htmldir} ]]; then |
144 |
+ rm -rf "${ROOT%/}"/usr/share/gtk-doc/html/${htmldir} |
145 |
fi |
146 |
if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then |
147 |
dosym ../../doc/${PF}/html/${htmldir} \ |
148 |
@@ -395,17 +395,17 @@ |
149 |
} |
150 |
|
151 |
pkg_postinst() { |
152 |
- mkdir -p "${ROOT}"run |
153 |
+ mkdir -p "${ROOT%/}"/run |
154 |
|
155 |
# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 |
156 |
# So try to remove it here (will only work if empty). |
157 |
- rmdir "${ROOT}"dev/loop 2>/dev/null |
158 |
- if [[ -d ${ROOT}dev/loop ]]; then |
159 |
+ rmdir "${ROOT%/}"/dev/loop 2>/dev/null |
160 |
+ if [[ -d ${ROOT%/}/dev/loop ]]; then |
161 |
ewarn "Please make sure your remove /dev/loop," |
162 |
ewarn "else losetup may be confused when looking for unused devices." |
163 |
fi |
164 |
|
165 |
- local fstab="${ROOT}"etc/fstab dev path fstype rest |
166 |
+ local fstab="${ROOT%/}"/etc/fstab dev path fstype rest |
167 |
while read -r dev path fstype rest; do |
168 |
if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then |
169 |
ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" |
170 |
@@ -414,7 +414,7 @@ |
171 |
fi |
172 |
done < "${fstab}" |
173 |
|
174 |
- if [[ -d ${ROOT}usr/lib/udev ]]; then |
175 |
+ if [[ -d ${ROOT%/}/usr/lib/udev ]]; then |
176 |
ewarn |
177 |
ewarn "Please re-emerge all packages on your system which install" |
178 |
ewarn "rules and helpers in /usr/lib/udev. They should now be in" |
179 |
@@ -425,8 +425,8 @@ |
180 |
ewarn "Note that qfile can be found in app-portage/portage-utils" |
181 |
fi |
182 |
|
183 |
- local old_cd_rules="${ROOT}"etc/udev/rules.d/70-persistent-cd.rules |
184 |
- local old_net_rules="${ROOT}"etc/udev/rules.d/70-persistent-net.rules |
185 |
+ local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules |
186 |
+ local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules |
187 |
for old_rules in "${old_cd_rules}" "${old_net_rules}"; do |
188 |
if [[ -f ${old_rules} ]]; then |
189 |
ewarn |
190 |
@@ -450,7 +450,7 @@ |
191 |
elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" |
192 |
elog "to disable the feature." |
193 |
|
194 |
- if has_version sys-apps/biosdevname; then |
195 |
+ if has_version 'sys-apps/biosdevname'; then |
196 |
ewarn |
197 |
ewarn "You can replace the functionality of sys-apps/biosdevname which has been" |
198 |
ewarn "detected to be installed with the new predictable network interface names." |
199 |
@@ -475,7 +475,7 @@ |
200 |
# do the same for 80-net-setup-link.rules to keep the old behavior |
201 |
local net_move=no |
202 |
local net_name_slot_sym=no |
203 |
- local net_rules_path="${ROOT}"/etc/udev/rules.d |
204 |
+ local net_rules_path="${ROOT%/}"/etc/udev/rules.d |
205 |
local net_name_slot="${net_rules_path}"/80-net-name-slot.rules |
206 |
local net_setup_link="${net_rules_path}"/80-net-setup-link.rules |
207 |
if [[ -e ${net_setup_link} ]]; then |
208 |
@@ -488,7 +488,7 @@ |
209 |
fi |
210 |
fi |
211 |
if [[ ${net_move} == yes ]]; then |
212 |
- ebegin "Because empty ${net_name_slot} was detected, we're adding ${net_setup_link}" |
213 |
+ ebegin "Copying ${net_name_slot} to ${net_setup_link}" |
214 |
|
215 |
if [[ ${net_name_slot_sym} == yes ]]; then |
216 |
ln -nfs /dev/null "${net_setup_link}" |
217 |
|
218 |
|
219 |
|
220 |
1.1003 sys-fs/udev/ChangeLog |
221 |
|
222 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1003&view=markup |
223 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1003&content-type=text/plain |
224 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.1002&r2=1.1003 |
225 |
|
226 |
Index: ChangeLog |
227 |
=================================================================== |
228 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v |
229 |
retrieving revision 1.1002 |
230 |
retrieving revision 1.1003 |
231 |
diff -u -r1.1002 -r1.1003 |
232 |
--- ChangeLog 2 Mar 2014 14:04:51 -0000 1.1002 |
233 |
+++ ChangeLog 2 Mar 2014 17:55:48 -0000 1.1003 |
234 |
@@ -1,12 +1,17 @@ |
235 |
# ChangeLog for sys-fs/udev |
236 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
237 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1002 2014/03/02 14:04:51 ssuominen Exp $ |
238 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1003 2014/03/02 17:55:48 ssuominen Exp $ |
239 |
|
240 |
02 Mar 2014; Samuli Suominen <ssuominen@g.o> udev-210.ebuild, |
241 |
udev-9999.ebuild: |
242 |
- Create /etc/udev/rules.d/80-net-setup-link.rules if user has empty |
243 |
- /etc/udev/rules.d/80-net-name-slot.rules or it's a symlink to /dev/null wrt |
244 |
- #503140 by Jorge Manuel B. S. Vicetto |
245 |
+ Use "${ROOT%/}"/path/to consistently everywhere, thanks to "floppym" |
246 |
+ for pointing it out. |
247 |
+ |
248 |
+ 02 Mar 2014; Samuli Suominen <ssuominen@g.o> udev-210.ebuild, |
249 |
+ udev-9999.ebuild: |
250 |
+ Migrate 80-net-name-slot.rules to 80-net-setup-link.rules in |
251 |
+ /etc/udev/rules.d if it's empty or a symlink to /dev/null wrt #503140 |
252 |
+ by Jorge Manuel B. S. Vicetto |
253 |
|
254 |
01 Mar 2014; Samuli Suominen <ssuominen@g.o> udev-210.ebuild, |
255 |
udev-9999.ebuild: |