1 |
mgorny 12/01/10 18:37:44 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: systemd-29-r5.ebuild systemd-37-r3.ebuild |
5 |
Removed: systemd-29-r4.ebuild systemd-37-r2.ebuild |
6 |
Log: |
7 |
Add systemctl compatibility symlink. |
8 |
|
9 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.18 sys-apps/systemd/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.18&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.18&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.17&r2=1.18 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
21 |
retrieving revision 1.17 |
22 |
retrieving revision 1.18 |
23 |
diff -u -r1.17 -r1.18 |
24 |
--- ChangeLog 6 Jan 2012 10:19:43 -0000 1.17 |
25 |
+++ ChangeLog 10 Jan 2012 18:37:44 -0000 1.18 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for sys-apps/systemd |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.17 2012/01/06 10:19:43 mgorny Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.18 2012/01/10 18:37:44 mgorny Exp $ |
31 |
+ |
32 |
+*systemd-37-r3 (10 Jan 2012) |
33 |
+*systemd-29-r5 (10 Jan 2012) |
34 |
+ |
35 |
+ 10 Jan 2012; Michał Górny <mgorny@g.o> -systemd-29-r4.ebuild, |
36 |
+ +systemd-29-r5.ebuild, -systemd-37-r2.ebuild, +systemd-37-r3.ebuild: |
37 |
+ Add systemctl compatibility symlink. |
38 |
|
39 |
*systemd-37-r2 (06 Jan 2012) |
40 |
*systemd-29-r4 (06 Jan 2012) |
41 |
|
42 |
|
43 |
|
44 |
1.1 sys-apps/systemd/systemd-29-r5.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-29-r5.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-29-r5.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: systemd-29-r5.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2012 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-29-r5.ebuild,v 1.1 2012/01/10 18:37:44 mgorny Exp $ |
54 |
|
55 |
EAPI=4 |
56 |
|
57 |
inherit autotools-utils bash-completion-r1 linux-info pam systemd |
58 |
|
59 |
DESCRIPTION="System and service manager for Linux" |
60 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
61 |
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2" |
62 |
|
63 |
LICENSE="GPL-2" |
64 |
SLOT="0" |
65 |
KEYWORDS="~amd64 ~x86" |
66 |
IUSE="audit cryptsetup gtk pam plymouth selinux tcpd" |
67 |
|
68 |
COMMON_DEPEND=">=sys-apps/dbus-1.4.10 |
69 |
>=sys-apps/util-linux-2.19 |
70 |
>=sys-fs/udev-171 |
71 |
sys-libs/libcap |
72 |
audit? ( >=sys-process/audit-2 ) |
73 |
cryptsetup? ( sys-fs/cryptsetup ) |
74 |
gtk? ( |
75 |
dev-libs/dbus-glib |
76 |
>=dev-libs/glib-2.26 |
77 |
x11-libs/gtk+:2 |
78 |
>=x11-libs/libnotify-0.7 ) |
79 |
pam? ( virtual/pam ) |
80 |
plymouth? ( sys-boot/plymouth ) |
81 |
selinux? ( sys-libs/libselinux ) |
82 |
tcpd? ( sys-apps/tcp-wrappers )" |
83 |
|
84 |
# Vala-0.10 doesn't work with libnotify 0.7.1 |
85 |
VALASLOT="0.14" |
86 |
# A little higher than upstream requires |
87 |
# but I had real trouble with 2.6.37 and systemd. |
88 |
MINKV="2.6.38" |
89 |
|
90 |
# dbus, udev versions because of systemd units |
91 |
# blocker on old packages to avoid collisions with above |
92 |
# openrc blocker to avoid udev rules starting openrc scripts |
93 |
RDEPEND="${COMMON_DEPEND} |
94 |
!<sys-apps/openrc-0.8.3" |
95 |
DEPEND="${COMMON_DEPEND} |
96 |
gtk? ( dev-lang/vala:${VALASLOT} ) |
97 |
>=sys-kernel/linux-headers-${MINKV}" |
98 |
|
99 |
# Due to vala being broken. |
100 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
101 |
|
102 |
pkg_setup() { |
103 |
enewgroup lock # used by var-lock.mount |
104 |
enewgroup tty 5 # used by mount-setup for /dev/pts |
105 |
} |
106 |
|
107 |
src_prepare() { |
108 |
# Force the rebuild of .vala sources |
109 |
touch src/*.vala || die |
110 |
|
111 |
# Fix hardcoded path in .vala. |
112 |
sed -i -e 's:/lib/systemd:/usr/lib/systemd:g' src/*.vala || die |
113 |
|
114 |
autotools-utils_src_prepare |
115 |
} |
116 |
|
117 |
src_configure() { |
118 |
local myeconfargs=( |
119 |
--with-distro=gentoo |
120 |
--with-rootdir=/usr |
121 |
--localstatedir=/var |
122 |
--docdir=/tmp/docs |
123 |
$(use_enable audit) |
124 |
$(use_enable cryptsetup libcryptsetup) |
125 |
$(use_enable gtk) |
126 |
$(use_enable pam) |
127 |
$(use_enable selinux) |
128 |
$(use_enable tcpd tcpwrap) |
129 |
|
130 |
# right now it is enabled on per-distro basis |
131 |
# let's just hack into the check |
132 |
$(use plymouth && echo have_plymouth=true) |
133 |
) |
134 |
|
135 |
if use gtk; then |
136 |
export VALAC="$(type -p valac-${VALASLOT})" |
137 |
fi |
138 |
|
139 |
autotools-utils_src_configure |
140 |
} |
141 |
|
142 |
src_install() { |
143 |
autotools-utils_src_install \ |
144 |
bashcompletiondir=/tmp |
145 |
|
146 |
# compat for init= use |
147 |
dosym ../usr/bin/systemd /bin/systemd |
148 |
# rsyslog.service depends on it... |
149 |
dosym ../usr/bin/systemctl /bin/systemctl |
150 |
|
151 |
# move files as necessary |
152 |
newbashcomp "${D}"/tmp/systemctl-bash-completion.sh ${PN} |
153 |
dodoc "${D}"/tmp/docs/* |
154 |
rm -r "${D}"/tmp || die |
155 |
|
156 |
# we just keep sysvinit tools, so no need for the mans |
157 |
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
158 |
|| die |
159 |
|
160 |
keepdir /run |
161 |
|
162 |
# Create /run/lock as required by new baselay/OpenRC compat. |
163 |
insinto /usr/lib/tmpfiles.d |
164 |
doins "${FILESDIR}"/gentoo-run.conf |
165 |
|
166 |
# Migration helpers. |
167 |
exeinto /usr/libexec/systemd |
168 |
doexe "${FILESDIR}"/update-etc-systemd-symlinks.sh |
169 |
systemd_dounit "${FILESDIR}"/update-etc-systemd-symlinks.{service,path} |
170 |
systemd_enable_service sysinit.target update-etc-systemd-symlinks.path |
171 |
} |
172 |
|
173 |
pkg_preinst() { |
174 |
local CONFIG_CHECK="~AUTOFS4_FS ~CGROUPS ~DEVTMPFS ~FANOTIFY ~IPV6" |
175 |
kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required" |
176 |
check_extra_config |
177 |
} |
178 |
|
179 |
optfeature() { |
180 |
elog " [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1} (${2})" |
181 |
} |
182 |
|
183 |
pkg_postinst() { |
184 |
if [[ ! -L "${ROOT}"etc/mtab ]]; then |
185 |
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." |
186 |
ewarn "It is known to cause users being unable to unmount user mounts. If you don't" |
187 |
ewarn "require that specific feature, please call:" |
188 |
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" |
189 |
ewarn |
190 |
fi |
191 |
|
192 |
elog "You may need to perform some additional configuration for some programs" |
193 |
elog "to work, see the systemd manpages for loading modules and handling tmpfiles:" |
194 |
elog " $ man modules-load.d" |
195 |
elog " $ man tmpfiles.d" |
196 |
elog |
197 |
|
198 |
elog "To get additional features, a number of optional runtime dependencies may" |
199 |
elog "be installed:" |
200 |
optfeature 'dev-python/dbus-python' 'for systemd-analyze' |
201 |
optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting ability' |
202 |
elog |
203 |
|
204 |
ewarn "Please note this is a work-in-progress and many packages in Gentoo" |
205 |
ewarn "do not supply systemd unit files yet. You are testing it on your own" |
206 |
ewarn "responsibility. Please remember than you can pass:" |
207 |
ewarn " init=/sbin/init" |
208 |
ewarn "to your kernel to boot using sysvinit / OpenRC." |
209 |
|
210 |
# Don't run it if we're outta / |
211 |
if [[ ! ${ROOT%/} ]]; then |
212 |
# Update symlinks to moved units. |
213 |
sh "${FILESDIR}"/update-etc-systemd-symlinks.sh |
214 |
|
215 |
# Try to start migration unit. |
216 |
ebegin "Trying to start migration helper path monitoring." |
217 |
systemctl --system start update-etc-systemd-symlinks.path 2>/dev/null |
218 |
eend ${?} |
219 |
fi |
220 |
} |
221 |
|
222 |
|
223 |
|
224 |
1.1 sys-apps/systemd/systemd-37-r3.ebuild |
225 |
|
226 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-37-r3.ebuild?rev=1.1&view=markup |
227 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-37-r3.ebuild?rev=1.1&content-type=text/plain |
228 |
|
229 |
Index: systemd-37-r3.ebuild |
230 |
=================================================================== |
231 |
# Copyright 1999-2012 Gentoo Foundation |
232 |
# Distributed under the terms of the GNU General Public License v2 |
233 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-37-r3.ebuild,v 1.1 2012/01/10 18:37:44 mgorny Exp $ |
234 |
|
235 |
EAPI=4 |
236 |
|
237 |
inherit autotools-utils bash-completion-r1 linux-info pam systemd |
238 |
|
239 |
DESCRIPTION="System and service manager for Linux" |
240 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
241 |
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2" |
242 |
|
243 |
LICENSE="GPL-2" |
244 |
SLOT="0" |
245 |
KEYWORDS="~amd64 ~x86" |
246 |
IUSE="acl audit cryptsetup gtk pam plymouth selinux tcpd" |
247 |
|
248 |
COMMON_DEPEND=">=sys-apps/dbus-1.4.10 |
249 |
>=sys-apps/util-linux-2.19 |
250 |
>=sys-fs/udev-172 |
251 |
sys-libs/libcap |
252 |
acl? ( sys-apps/acl ) |
253 |
audit? ( >=sys-process/audit-2 ) |
254 |
cryptsetup? ( sys-fs/cryptsetup ) |
255 |
gtk? ( |
256 |
dev-libs/dbus-glib |
257 |
>=dev-libs/glib-2.26 |
258 |
x11-libs/gtk+:2 |
259 |
>=x11-libs/libnotify-0.7 ) |
260 |
pam? ( virtual/pam ) |
261 |
plymouth? ( sys-boot/plymouth ) |
262 |
selinux? ( sys-libs/libselinux ) |
263 |
tcpd? ( sys-apps/tcp-wrappers )" |
264 |
|
265 |
# Vala-0.10 doesn't work with libnotify 0.7.1 |
266 |
VALASLOT="0.12" |
267 |
# A little higher than upstream requires |
268 |
# but I had real trouble with 2.6.37 and systemd. |
269 |
MINKV="2.6.38" |
270 |
|
271 |
# dbus, udev versions because of systemd units |
272 |
# blocker on old packages to avoid collisions with above |
273 |
# openrc blocker to avoid udev rules starting openrc scripts |
274 |
RDEPEND="${COMMON_DEPEND} |
275 |
!<sys-apps/openrc-0.8.3" |
276 |
DEPEND="${COMMON_DEPEND} |
277 |
dev-util/gperf |
278 |
dev-util/intltool |
279 |
gtk? ( dev-lang/vala:${VALASLOT} ) |
280 |
>=sys-kernel/linux-headers-${MINKV}" |
281 |
|
282 |
# Due to vala being broken. |
283 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
284 |
|
285 |
pkg_setup() { |
286 |
enewgroup lock # used by var-lock.mount |
287 |
enewgroup tty 5 # used by mount-setup for /dev/pts |
288 |
} |
289 |
|
290 |
src_prepare() { |
291 |
# Force the rebuild of .vala sources |
292 |
touch src/*.vala || die |
293 |
|
294 |
# Fix hardcoded path in .vala. |
295 |
sed -i -e 's:/lib/systemd:/usr/lib/systemd:g' src/*.vala || die |
296 |
|
297 |
autotools-utils_src_prepare |
298 |
} |
299 |
|
300 |
src_configure() { |
301 |
local myeconfargs=( |
302 |
--with-distro=gentoo |
303 |
--with-rootdir=/usr |
304 |
--with-rootlibdir=/usr/$(get_libdir) |
305 |
--localstatedir=/var |
306 |
--docdir=/tmp/docs |
307 |
$(use_enable acl) |
308 |
$(use_enable audit) |
309 |
$(use_enable cryptsetup libcryptsetup) |
310 |
$(use_enable gtk) |
311 |
$(use_enable pam) |
312 |
$(use_enable plymouth) |
313 |
$(use_enable selinux) |
314 |
$(use_enable tcpd tcpwrap) |
315 |
) |
316 |
|
317 |
if use gtk; then |
318 |
export VALAC="$(type -p valac-${VALASLOT})" |
319 |
fi |
320 |
|
321 |
autotools-utils_src_configure |
322 |
} |
323 |
|
324 |
src_install() { |
325 |
autotools-utils_src_install \ |
326 |
bashcompletiondir=/tmp |
327 |
|
328 |
# compat for init= use |
329 |
dosym ../usr/bin/systemd /bin/systemd |
330 |
# rsyslog.service depends on it... |
331 |
dosym ../usr/bin/systemctl /bin/systemctl |
332 |
|
333 |
# move files as necessary |
334 |
newbashcomp "${D}"/tmp/systemctl-bash-completion.sh ${PN} |
335 |
dodoc "${D}"/tmp/docs/* |
336 |
rm -r "${D}"/tmp || die |
337 |
|
338 |
# we just keep sysvinit tools, so no need for the mans |
339 |
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
340 |
|| die |
341 |
|
342 |
keepdir /run |
343 |
|
344 |
# Create /run/lock as required by new baselay/OpenRC compat. |
345 |
insinto /usr/lib/tmpfiles.d |
346 |
doins "${FILESDIR}"/gentoo-run.conf |
347 |
|
348 |
# Migration helpers. |
349 |
exeinto /usr/libexec/systemd |
350 |
doexe "${FILESDIR}"/update-etc-systemd-symlinks.sh |
351 |
systemd_dounit "${FILESDIR}"/update-etc-systemd-symlinks.{service,path} |
352 |
systemd_enable_service sysinit.target update-etc-systemd-symlinks.path |
353 |
} |
354 |
|
355 |
pkg_preinst() { |
356 |
local CONFIG_CHECK="~AUTOFS4_FS ~CGROUPS ~DEVTMPFS ~FANOTIFY ~IPV6" |
357 |
kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required" |
358 |
check_extra_config |
359 |
} |
360 |
|
361 |
optfeature() { |
362 |
elog " [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1} (${2})" |
363 |
} |
364 |
|
365 |
pkg_postinst() { |
366 |
if [[ ! -L "${ROOT}"etc/mtab ]]; then |
367 |
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." |
368 |
ewarn "It is known to cause users being unable to unmount user mounts. If you don't" |
369 |
ewarn "require that specific feature, please call:" |
370 |
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" |
371 |
ewarn |
372 |
fi |
373 |
|
374 |
elog "You may need to perform some additional configuration for some programs" |
375 |
elog "to work, see the systemd manpages for loading modules and handling tmpfiles:" |
376 |
elog " $ man modules-load.d" |
377 |
elog " $ man tmpfiles.d" |
378 |
elog |
379 |
|
380 |
elog "To get additional features, a number of optional runtime dependencies may" |
381 |
elog "be installed:" |
382 |
optfeature 'dev-python/dbus-python' 'for systemd-analyze' |
383 |
optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting ability' |
384 |
elog |
385 |
|
386 |
ewarn "Please note this is a work-in-progress and many packages in Gentoo" |
387 |
ewarn "do not supply systemd unit files yet. You are testing it on your own" |
388 |
ewarn "responsibility. Please remember than you can pass:" |
389 |
ewarn " init=/sbin/init" |
390 |
ewarn "to your kernel to boot using sysvinit / OpenRC." |
391 |
|
392 |
# Don't run it if we're outta / |
393 |
if [[ ! ${ROOT%/} ]]; then |
394 |
# Update symlinks to moved units. |
395 |
sh "${FILESDIR}"/update-etc-systemd-symlinks.sh |
396 |
|
397 |
# Try to start migration unit. |
398 |
ebegin "Trying to start migration helper path monitoring." |
399 |
systemctl --system start update-etc-systemd-symlinks.path 2>/dev/null |
400 |
eend ${?} |
401 |
fi |
402 |
} |