Gentoo Archives: gentoo-commits

From: "William Hubbs (williamh)" <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/udev-init-scripts: udev-init-scripts-9999.ebuild ChangeLog udev-init-scripts-14.ebuild
Date: Wed, 01 Aug 2012 17:15:35
Message-Id: 20120801171525.1FF712004B@flycatcher.gentoo.org
1 williamh 12/08/01 17:15:24
2
3 Modified: udev-init-scripts-9999.ebuild ChangeLog
4 Added: udev-init-scripts-14.ebuild
5 Log:
6 version bump and sync live ebuild
7
8 (Portage version: 2.2.0_alpha120/cvs/Linux i686)
9
10 Revision Changes Path
11 1.9 sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.9&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.9&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?r1=1.8&r2=1.9
16
17 Index: udev-init-scripts-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v
20 retrieving revision 1.8
21 retrieving revision 1.9
22 diff -u -r1.8 -r1.9
23 --- udev-init-scripts-9999.ebuild 3 May 2012 03:03:43 -0000 1.8
24 +++ udev-init-scripts-9999.ebuild 1 Aug 2012 17:15:24 -0000 1.9
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.8 2012/05/03 03:03:43 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.9 2012/08/01 17:15:24 williamh Exp $
30
31 EAPI=4
32
33 @@ -22,10 +22,10 @@
34 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
35 fi
36
37 -DEPEND="!<sys-fs/udev-182"
38 -RDEPEND="${DEPEND}
39 - >=sys-fs/udev-182
40 - sys-apps/openrc"
41 +DEPEND=""
42 +RDEPEND=">=sys-fs/udev-187
43 + sys-apps/openrc
44 + !<sys-fs/udev-186"
45
46 src_compile()
47 {
48 @@ -34,58 +34,30 @@
49
50 pkg_postinst()
51 {
52 - local enable_postmount=false
53 -
54 - # FIXME: inconsistent handling of init-scripts here
55 - # * udev is added to sysinit in openrc-ebuild
56 - # * we add udev-postmount to default in here
57 - #
58 -
59 # If we are building stages, add udev to the sysinit runlevel automatically.
60 if use build
61 then
62 - if [[ -x "${ROOT}"/etc/init.d/udev \
63 + if [[ -x "${ROOT}"/etc/init.d/udev \
64 && -d "${ROOT}"/etc/runlevels/sysinit ]]
65 then
66 ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
67 fi
68 - enable_postmount=true
69 fi
70
71 # migration to >=openrc-0.4
72 - if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
73 + if [[ -e "${ROOT}"/etc/runlevels/sysinit \
74 + && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
75 then
76 ewarn
77 ewarn "You need to add the udev init script to the runlevel sysinit,"
78 - ewarn "else your system will not be able to boot"
79 + ewarn "otherwise your system will not be able to boot"
80 ewarn "after updating to >=openrc-0.4.0"
81 ewarn "Run this to enable udev for >=openrc-0.4.0:"
82 ewarn "\trc-update add udev sysinit"
83 ewarn
84 fi
85
86 - # add udev-postmount to default runlevel instead of that ugly injecting
87 - # like a hotplug event, 2009/10/15
88 -
89 - # already enabled?
90 - [[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return
91 -
92 - [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
93 - [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
94 -
95 - if $enable_postmount
96 - then
97 - local initd=udev-postmount
98 -
99 - if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
100 - [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
101 - then
102 - ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
103 - elog "Auto-adding '${initd}' service to your default runlevel"
104 - fi
105 - else
106 - elog "You should add the udev-postmount service to default runlevel."
107 - elog "Run this to add it:"
108 - elog "\trc-update add udev-postmount default"
109 - fi
110 + ewarn "The udev-postmount service has been removed because the reasons for"
111 + ewarn "its existance have been removed upstream."
112 + ewarn "Please remove it from your runlevels."
113 }
114
115
116
117 1.17 sys-fs/udev-init-scripts/ChangeLog
118
119 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.17&view=markup
120 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.17&content-type=text/plain
121 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?r1=1.16&r2=1.17
122
123 Index: ChangeLog
124 ===================================================================
125 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v
126 retrieving revision 1.16
127 retrieving revision 1.17
128 diff -u -r1.16 -r1.17
129 --- ChangeLog 22 Jul 2012 19:01:21 -0000 1.16
130 +++ ChangeLog 1 Aug 2012 17:15:24 -0000 1.17
131 @@ -1,6 +1,12 @@
132 # ChangeLog for sys-fs/udev-init-scripts
133 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
134 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.16 2012/07/22 19:01:21 armin76 Exp $
135 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.17 2012/08/01 17:15:24 williamh Exp $
136 +
137 +*udev-init-scripts-14 (01 Aug 2012)
138 +
139 + 01 Aug 2012; William Hubbs <williamh@g.o>
140 + +udev-init-scripts-14.ebuild, udev-init-scripts-9999.ebuild:
141 + version bump and sync live ebuild
142
143 22 Jul 2012; Raúl Porcel <armin76@g.o> udev-init-scripts-10.ebuild,
144 udev-init-scripts-12.ebuild:
145
146
147
148 1.1 sys-fs/udev-init-scripts/udev-init-scripts-14.ebuild
149
150 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-14.ebuild?rev=1.1&view=markup
151 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-14.ebuild?rev=1.1&content-type=text/plain
152
153 Index: udev-init-scripts-14.ebuild
154 ===================================================================
155 # Copyright 1999-2012 Gentoo Foundation
156 # Distributed under the terms of the GNU General Public License v2
157 # $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-14.ebuild,v 1.1 2012/08/01 17:15:24 williamh Exp $
158
159 EAPI=4
160
161 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
162
163 if [ "${PV}" = "9999" ]; then
164 inherit git-2
165 fi
166
167 DESCRIPTION="udev startup scripts for openrc"
168 HOMEPAGE="http://www.gentoo.org"
169
170 LICENSE="GPL-2"
171 SLOT="0"
172 IUSE=""
173
174 if [ "${PV}" != "9999" ]; then
175 SRC_URI="mirror://gentoo/${P}.tar.bz2"
176 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
177 fi
178
179 DEPEND=""
180 RDEPEND=">=sys-fs/udev-187
181 sys-apps/openrc
182 !<sys-fs/udev-186"
183
184 src_compile()
185 {
186 return 0
187 }
188
189 pkg_postinst()
190 {
191 # If we are building stages, add udev to the sysinit runlevel automatically.
192 if use build
193 then
194 if [[ -x "${ROOT}"/etc/init.d/udev \
195 && -d "${ROOT}"/etc/runlevels/sysinit ]]
196 then
197 ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
198 fi
199 fi
200
201 # migration to >=openrc-0.4
202 if [[ -e "${ROOT}"/etc/runlevels/sysinit \
203 && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
204 then
205 ewarn
206 ewarn "You need to add the udev init script to the runlevel sysinit,"
207 ewarn "otherwise your system will not be able to boot"
208 ewarn "after updating to >=openrc-0.4.0"
209 ewarn "Run this to enable udev for >=openrc-0.4.0:"
210 ewarn "\trc-update add udev sysinit"
211 ewarn
212 fi
213
214 ewarn "The udev-postmount service has been removed because the reasons for"
215 ewarn "its existance have been removed upstream."
216 ewarn "Please remove it from your runlevels."
217 }