1 |
mgorny 12/12/02 10:58:37 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: systemd-196.ebuild |
5 |
Log: |
6 |
Version bump. Enable Python support. Drop old patches. |
7 |
|
8 |
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.61 sys-apps/systemd/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.61&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.61&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.60&r2=1.61 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
20 |
retrieving revision 1.60 |
21 |
retrieving revision 1.61 |
22 |
diff -u -r1.60 -r1.61 |
23 |
--- ChangeLog 1 Dec 2012 15:26:35 -0000 1.60 |
24 |
+++ ChangeLog 2 Dec 2012 10:58:37 -0000 1.61 |
25 |
@@ -1,6 +1,21 @@ |
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.60 2012/12/01 15:26:35 mgorny Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.61 2012/12/02 10:58:37 mgorny Exp $ |
30 |
+ |
31 |
+*systemd-196 (02 Dec 2012) |
32 |
+ |
33 |
+ 02 Dec 2012; Michał Górny <mgorny@g.o> |
34 |
+ +files/196-0001-Disable-udev-targets.patch, +systemd-196.ebuild, |
35 |
+ -files/0001-Disable-udev-targets-for-udev-189.patch, |
36 |
+ -files/0002-journald-add-missing-includes.patch, |
37 |
+ -files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch, |
38 |
+ -files/0004-journal-don-t-try-to-compress-without-XZ.patch, |
39 |
+ -files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch, |
40 |
+ -files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch, |
41 |
+ -files/update-etc-systemd-symlinks.path, |
42 |
+ -files/update-etc-systemd-symlinks.service, |
43 |
+ -files/update-etc-systemd-symlinks.sh: |
44 |
+ Version bump. Enable Python support. Drop old patches. |
45 |
|
46 |
01 Dec 2012; Michał Górny <mgorny@g.o> -systemd-189-r3.ebuild, |
47 |
-systemd-191-r1.ebuild, -systemd-192.ebuild, -systemd-193.ebuild, |
48 |
|
49 |
|
50 |
|
51 |
1.1 sys-apps/systemd/systemd-196.ebuild |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-196.ebuild?rev=1.1&view=markup |
54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-196.ebuild?rev=1.1&content-type=text/plain |
55 |
|
56 |
Index: systemd-196.ebuild |
57 |
=================================================================== |
58 |
# Copyright 1999-2012 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-196.ebuild,v 1.1 2012/12/02 10:58:37 mgorny Exp $ |
61 |
|
62 |
EAPI=4 |
63 |
|
64 |
PYTHON_COMPAT=( python2_7 ) |
65 |
inherit autotools-utils bash-completion-r1 linux-info pam \ |
66 |
python-single-r1 systemd user |
67 |
|
68 |
DESCRIPTION="System and service manager for Linux" |
69 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
70 |
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" |
71 |
|
72 |
LICENSE="GPL-2 LGPL-2.1 MIT" |
73 |
SLOT="0" |
74 |
KEYWORDS="~amd64 ~arm ~x86" |
75 |
IUSE="acl audit cryptsetup gcrypt http lzma pam python qrcode selinux |
76 |
tcpd vanilla xattr" |
77 |
|
78 |
MINKV="2.6.39" |
79 |
|
80 |
COMMON_DEPEND=">=sys-apps/dbus-1.4.10 |
81 |
>=sys-apps/kmod-5 |
82 |
>=sys-apps/util-linux-2.20 |
83 |
~sys-fs/udev-${PV} |
84 |
sys-libs/libcap |
85 |
acl? ( sys-apps/acl ) |
86 |
audit? ( >=sys-process/audit-2 ) |
87 |
cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) |
88 |
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) |
89 |
http? ( net-libs/libmicrohttpd ) |
90 |
lzma? ( app-arch/xz-utils ) |
91 |
pam? ( virtual/pam ) |
92 |
python? ( ${PYTHON_DEPS} ) |
93 |
qrcode? ( media-gfx/qrencode ) |
94 |
selinux? ( sys-libs/libselinux ) |
95 |
tcpd? ( sys-apps/tcp-wrappers ) |
96 |
xattr? ( sys-apps/attr )" |
97 |
|
98 |
RDEPEND="${COMMON_DEPEND} |
99 |
sys-apps/hwids |
100 |
|| ( |
101 |
>=sys-apps/util-linux-2.22 |
102 |
<sys-apps/sysvinit-2.88-r4 |
103 |
) |
104 |
!<sys-libs/glibc-2.10 |
105 |
!~sys-fs/udev-187" |
106 |
|
107 |
# sys-fs/quota is necessary to store correct paths in unit files |
108 |
DEPEND="${COMMON_DEPEND} |
109 |
app-arch/xz-utils |
110 |
app-text/docbook-xsl-stylesheets |
111 |
dev-libs/libxslt |
112 |
dev-util/gperf |
113 |
dev-util/intltool |
114 |
sys-fs/quota |
115 |
>=sys-kernel/linux-headers-${MINKV}" |
116 |
|
117 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
118 |
|
119 |
pkg_setup() { |
120 |
enewgroup lock # used by var-lock.mount |
121 |
enewgroup tty 5 # used by mount-setup for /dev/pts |
122 |
|
123 |
use python && python-single-r1_pkg_setup |
124 |
} |
125 |
|
126 |
src_prepare() { |
127 |
# systemd-analyze is for python2.7 only nowadays. |
128 |
sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze |
129 |
|
130 |
# link against external udev. |
131 |
sed -i -e 's:libudev\.la:-ludev:' Makefile.am |
132 |
|
133 |
local PATCHES=( |
134 |
"${FILESDIR}"/196-0001-Disable-udev-targets.patch |
135 |
) |
136 |
|
137 |
autotools-utils_src_prepare |
138 |
|
139 |
# XXX: support it within eclass |
140 |
eautomake |
141 |
} |
142 |
|
143 |
src_configure() { |
144 |
local myeconfargs=( |
145 |
--localstatedir=/var |
146 |
--with-distro=$(use vanilla && echo other || echo gentoo) |
147 |
# install everything to /usr |
148 |
--with-rootprefix=/usr |
149 |
--with-rootlibdir=/usr/$(get_libdir) |
150 |
# but pam modules have to lie in /lib* |
151 |
--with-pamlibdir=/$(get_libdir)/security |
152 |
# make sure we get /bin:/sbin in $PATH |
153 |
--enable-split-usr |
154 |
# udev parts |
155 |
--disable-introspection |
156 |
--disable-gtk-doc |
157 |
--disable-gudev |
158 |
$(use_enable acl) |
159 |
$(use_enable audit) |
160 |
$(use_enable cryptsetup libcryptsetup) |
161 |
$(use_enable gcrypt) |
162 |
$(use_enable http microhttpd) |
163 |
$(use_enable lzma xz) |
164 |
$(use_enable pam) |
165 |
$(use_with python) |
166 |
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python}) |
167 |
$(use_enable qrcode qrencode) |
168 |
$(use_enable selinux) |
169 |
$(use_enable tcpd tcpwrap) |
170 |
$(use_enable xattr) |
171 |
) |
172 |
|
173 |
autotools-utils_src_configure |
174 |
} |
175 |
|
176 |
src_install() { |
177 |
autotools-utils_src_install \ |
178 |
bashcompletiondir=/tmp |
179 |
|
180 |
# remove pam.d plugin .la-file |
181 |
prune_libtool_files --modules |
182 |
|
183 |
# compat for init= use |
184 |
dosym ../usr/lib/systemd/systemd /bin/systemd |
185 |
dosym ../lib/systemd/systemd /usr/bin/systemd |
186 |
# rsyslog.service depends on it... |
187 |
dosym ../usr/bin/systemctl /bin/systemctl |
188 |
|
189 |
# move files as necessary |
190 |
newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN} |
191 |
rm -r "${D}"/tmp || die |
192 |
|
193 |
# we just keep sysvinit tools, so no need for the mans |
194 |
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
195 |
|| die |
196 |
rm "${D}"/usr/share/man/man1/init.1 || die |
197 |
|
198 |
if ! use vanilla; then |
199 |
# Create /run/lock as required by new baselay/OpenRC compat. |
200 |
systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf |
201 |
|
202 |
# Add mount-rules for /var/lock and /var/run, bug #433607 |
203 |
systemd_dounit "${FILESDIR}"/var-{lock,run}.mount |
204 |
systemd_enable_service sysinit.target var-lock.mount |
205 |
systemd_enable_service sysinit.target var-run.mount |
206 |
fi |
207 |
|
208 |
# Disable storing coredumps in journald, bug #433457 |
209 |
mv "${D}"/usr/lib/sysctl.d/coredump.conf \ |
210 |
"${D}"/etc/sysctl.d/coredump.conf.disabled || die |
211 |
|
212 |
# Preserve empty dirs in /etc & /var, bug #437008 |
213 |
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ |
214 |
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd |
215 |
|
216 |
# Check whether we won't break user's system. |
217 |
[[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.' |
218 |
[[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.' |
219 |
} |
220 |
|
221 |
pkg_preinst() { |
222 |
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS |
223 |
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD |
224 |
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" |
225 |
kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required" |
226 |
check_extra_config |
227 |
} |
228 |
|
229 |
optfeature() { |
230 |
local i desc=${1} text |
231 |
shift |
232 |
|
233 |
text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" |
234 |
shift |
235 |
|
236 |
for i; do |
237 |
elog "${text}" |
238 |
text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" |
239 |
done |
240 |
elog "${text} (${desc})" |
241 |
} |
242 |
|
243 |
pkg_postinst() { |
244 |
mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble." |
245 |
if [[ ! -L "${ROOT}"/etc/mtab ]]; then |
246 |
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." |
247 |
ewarn "It is known to cause users being unable to unmount user mounts. If you don't" |
248 |
ewarn "require that specific feature, please call:" |
249 |
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" |
250 |
ewarn |
251 |
fi |
252 |
|
253 |
elog "To get additional features, a number of optional runtime dependencies may" |
254 |
elog "be installed:" |
255 |
optfeature 'for systemd-analyze' \ |
256 |
'dev-lang/python:2.7' 'dev-python/dbus-python' |
257 |
optfeature 'for systemd-analyze plotting ability' \ |
258 |
'dev-python/pycairo[svg]' |
259 |
optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \ |
260 |
'sys-apps/systemd-ui' |
261 |
elog |
262 |
|
263 |
ewarn "Please note this is a work-in-progress and many packages in Gentoo" |
264 |
ewarn "do not supply systemd unit files yet. You are testing it on your own" |
265 |
ewarn "responsibility. Please remember than you can pass:" |
266 |
ewarn " init=/sbin/init" |
267 |
ewarn "to your kernel to boot using sysvinit / OpenRC." |
268 |
} |