1 |
mgorny 12/01/11 07:56:36 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: systemd-38.ebuild |
5 |
Log: |
6 |
Version bump. This is the first release including systemd-journald for logging. |
7 |
|
8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.19 sys-apps/systemd/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.19&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.19&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.18&r2=1.19 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
20 |
retrieving revision 1.18 |
21 |
retrieving revision 1.19 |
22 |
diff -u -r1.18 -r1.19 |
23 |
--- ChangeLog 10 Jan 2012 18:37:44 -0000 1.18 |
24 |
+++ ChangeLog 11 Jan 2012 07:56:35 -0000 1.19 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for sys-apps/systemd |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.18 2012/01/10 18:37:44 mgorny Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.19 2012/01/11 07:56:35 mgorny Exp $ |
30 |
+ |
31 |
+*systemd-38 (11 Jan 2012) |
32 |
+ |
33 |
+ 11 Jan 2012; Michał Górny <mgorny@g.o> +systemd-38.ebuild: |
34 |
+ Version bump. This is the first release including systemd-journald for |
35 |
+ logging. |
36 |
|
37 |
*systemd-37-r3 (10 Jan 2012) |
38 |
*systemd-29-r5 (10 Jan 2012) |
39 |
|
40 |
|
41 |
|
42 |
1.1 sys-apps/systemd/systemd-38.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-38.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-38.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: systemd-38.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2012 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-38.ebuild,v 1.1 2012/01/11 07:56:35 mgorny Exp $ |
52 |
|
53 |
EAPI=4 |
54 |
|
55 |
inherit autotools-utils bash-completion-r1 linux-info pam systemd |
56 |
|
57 |
DESCRIPTION="System and service manager for Linux" |
58 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
59 |
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
KEYWORDS="~amd64 ~x86" |
64 |
IUSE="acl audit cryptsetup gtk lzma pam plymouth selinux tcpd" |
65 |
|
66 |
COMMON_DEPEND=">=sys-apps/dbus-1.4.10 |
67 |
>=sys-apps/util-linux-2.19 |
68 |
>=sys-fs/udev-172 |
69 |
sys-libs/libcap |
70 |
acl? ( sys-apps/acl ) |
71 |
audit? ( >=sys-process/audit-2 ) |
72 |
cryptsetup? ( sys-fs/cryptsetup ) |
73 |
gtk? ( |
74 |
dev-libs/dbus-glib |
75 |
>=dev-libs/glib-2.26 |
76 |
dev-libs/libgee:0 |
77 |
x11-libs/gtk+:2 |
78 |
>=x11-libs/libnotify-0.7 ) |
79 |
lzma? ( app-arch/xz-utils ) |
80 |
pam? ( virtual/pam ) |
81 |
plymouth? ( sys-boot/plymouth ) |
82 |
selinux? ( sys-libs/libselinux ) |
83 |
tcpd? ( sys-apps/tcp-wrappers )" |
84 |
|
85 |
# Vala-0.10 doesn't work with libnotify 0.7.1 |
86 |
VALASLOT="0.12" |
87 |
# A little higher than upstream requires |
88 |
# but I had real trouble with 2.6.37 and systemd. |
89 |
MINKV="2.6.38" |
90 |
|
91 |
# dbus, udev versions because of systemd units |
92 |
# blocker on old packages to avoid collisions with above |
93 |
# openrc blocker to avoid udev rules starting openrc scripts |
94 |
RDEPEND="${COMMON_DEPEND} |
95 |
!<sys-apps/openrc-0.8.3" |
96 |
DEPEND="${COMMON_DEPEND} |
97 |
app-arch/xz-utils |
98 |
dev-util/gperf |
99 |
dev-util/intltool |
100 |
gtk? ( dev-lang/vala:${VALASLOT} ) |
101 |
>=sys-kernel/linux-headers-${MINKV}" |
102 |
|
103 |
# Due to vala being broken. |
104 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
105 |
|
106 |
pkg_setup() { |
107 |
enewgroup lock # used by var-lock.mount |
108 |
enewgroup tty 5 # used by mount-setup for /dev/pts |
109 |
} |
110 |
|
111 |
src_prepare() { |
112 |
# Force the rebuild of .vala sources |
113 |
touch src/*.vala || die |
114 |
|
115 |
# Fix hardcoded path in .vala. |
116 |
sed -i -e 's:/lib/systemd:/usr/lib/systemd:g' src/*.vala || die |
117 |
|
118 |
autotools-utils_src_prepare |
119 |
} |
120 |
|
121 |
src_configure() { |
122 |
local myeconfargs=( |
123 |
--with-distro=gentoo |
124 |
--with-rootprefix=/usr |
125 |
--with-rootlibdir=/usr/$(get_libdir) |
126 |
--localstatedir=/var |
127 |
--docdir=/tmp/docs |
128 |
$(use_enable acl) |
129 |
$(use_enable audit) |
130 |
$(use_enable cryptsetup libcryptsetup) |
131 |
$(use_enable gtk) |
132 |
$(use_enable lzma xz) |
133 |
$(use_enable pam) |
134 |
$(use_enable plymouth) |
135 |
$(use_enable selinux) |
136 |
$(use_enable tcpd tcpwrap) |
137 |
) |
138 |
|
139 |
if use gtk; then |
140 |
export VALAC="$(type -p valac-${VALASLOT})" |
141 |
fi |
142 |
|
143 |
autotools-utils_src_configure |
144 |
} |
145 |
|
146 |
src_install() { |
147 |
autotools-utils_src_install \ |
148 |
bashcompletiondir=/tmp |
149 |
|
150 |
# compat for init= use |
151 |
dosym ../usr/bin/systemd /bin/systemd |
152 |
# rsyslog.service depends on it... |
153 |
dosym ../usr/bin/systemctl /bin/systemctl |
154 |
|
155 |
# move files as necessary |
156 |
newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN} |
157 |
dodoc "${D}"/tmp/docs/* |
158 |
rm -r "${D}"/tmp || die |
159 |
|
160 |
# we just keep sysvinit tools, so no need for the mans |
161 |
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
162 |
|| die |
163 |
rm "${D}"/usr/share/man/man1/init.1 || die |
164 |
|
165 |
keepdir /run |
166 |
|
167 |
# Create /run/lock as required by new baselay/OpenRC compat. |
168 |
insinto /usr/lib/tmpfiles.d |
169 |
doins "${FILESDIR}"/gentoo-run.conf |
170 |
|
171 |
# Migration helpers. |
172 |
exeinto /usr/libexec/systemd |
173 |
doexe "${FILESDIR}"/update-etc-systemd-symlinks.sh |
174 |
systemd_dounit "${FILESDIR}"/update-etc-systemd-symlinks.{service,path} |
175 |
systemd_enable_service sysinit.target update-etc-systemd-symlinks.path |
176 |
} |
177 |
|
178 |
pkg_preinst() { |
179 |
local CONFIG_CHECK="~AUTOFS4_FS ~CGROUPS ~DEVTMPFS ~FANOTIFY ~IPV6" |
180 |
kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required" |
181 |
check_extra_config |
182 |
} |
183 |
|
184 |
optfeature() { |
185 |
elog " [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1} (${2})" |
186 |
} |
187 |
|
188 |
pkg_postinst() { |
189 |
if [[ ! -L "${ROOT}"etc/mtab ]]; then |
190 |
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." |
191 |
ewarn "It is known to cause users being unable to unmount user mounts. If you don't" |
192 |
ewarn "require that specific feature, please call:" |
193 |
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" |
194 |
ewarn |
195 |
fi |
196 |
|
197 |
elog "You may need to perform some additional configuration for some programs" |
198 |
elog "to work, see the systemd manpages for loading modules and handling tmpfiles:" |
199 |
elog " $ man modules-load.d" |
200 |
elog " $ man tmpfiles.d" |
201 |
elog |
202 |
|
203 |
elog "To get additional features, a number of optional runtime dependencies may" |
204 |
elog "be installed:" |
205 |
optfeature 'dev-python/dbus-python' 'for systemd-analyze' |
206 |
optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting ability' |
207 |
elog |
208 |
|
209 |
ewarn "Please note this is a work-in-progress and many packages in Gentoo" |
210 |
ewarn "do not supply systemd unit files yet. You are testing it on your own" |
211 |
ewarn "responsibility. Please remember than you can pass:" |
212 |
ewarn " init=/sbin/init" |
213 |
ewarn "to your kernel to boot using sysvinit / OpenRC." |
214 |
|
215 |
# Don't run it if we're outta / |
216 |
if [[ ! ${ROOT%/} ]]; then |
217 |
# Update symlinks to moved units. |
218 |
sh "${FILESDIR}"/update-etc-systemd-symlinks.sh |
219 |
|
220 |
# Try to start migration unit. |
221 |
ebegin "Trying to start migration helper path monitoring." |
222 |
systemctl --system start update-etc-systemd-symlinks.path 2>/dev/null |
223 |
eend ${?} |
224 |
fi |
225 |
} |