1 |
mgorny 13/07/29 22:11:19 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: systemd-9999-r1.ebuild |
5 |
Removed: systemd-9999.ebuild |
6 |
Log: |
7 |
Move the Gentoo-specific files from the live ebuild to gentoo-systemd-integration. Revbump to ensure smooth migration. |
8 |
|
9 |
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!) |
10 |
|
11 |
Revision Changes Path |
12 |
1.151 sys-apps/systemd/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.151&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.151&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.150&r2=1.151 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
21 |
retrieving revision 1.150 |
22 |
retrieving revision 1.151 |
23 |
diff -u -r1.150 -r1.151 |
24 |
--- ChangeLog 28 Jul 2013 19:46:11 -0000 1.150 |
25 |
+++ ChangeLog 29 Jul 2013 22:11:19 -0000 1.151 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for sys-apps/systemd |
28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.150 2013/07/28 19:46:11 ago Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.151 2013/07/29 22:11:19 mgorny Exp $ |
31 |
+ |
32 |
+*systemd-9999-r1 (29 Jul 2013) |
33 |
+ |
34 |
+ 29 Jul 2013; Michał Górny <mgorny@g.o> +systemd-9999-r1.ebuild, |
35 |
+ -systemd-9999.ebuild: |
36 |
+ Move the Gentoo-specific files from the live ebuild to gentoo-systemd- |
37 |
+ integration. Revbump to ensure smooth migration. |
38 |
|
39 |
28 Jul 2013; Agostino Sarubbo <ago@g.o> systemd-204.ebuild: |
40 |
Stable for arm, wrt bug #477910 |
41 |
|
42 |
|
43 |
|
44 |
1.1 sys-apps/systemd/systemd-9999-r1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: systemd-9999-r1.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2013 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.1 2013/07/29 22:11:19 mgorny Exp $ |
54 |
|
55 |
EAPI=5 |
56 |
|
57 |
#if LIVE |
58 |
AUTOTOOLS_AUTORECONF=yes |
59 |
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN} |
60 |
http://cgit.freedesktop.org/${PN}/${PN}/" |
61 |
|
62 |
inherit git-2 |
63 |
#endif |
64 |
|
65 |
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all |
66 |
PYTHON_COMPAT=( python2_7 ) |
67 |
inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \ |
68 |
pam python-single-r1 systemd toolchain-funcs udev user |
69 |
|
70 |
DESCRIPTION="System and service manager for Linux" |
71 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
72 |
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" |
73 |
|
74 |
LICENSE="GPL-2 LGPL-2.1 MIT" |
75 |
SLOT="0" |
76 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
77 |
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection |
78 |
+kmod lzma openrc pam policykit python qrcode selinux tcpd test |
79 |
vanilla xattr" |
80 |
|
81 |
MINKV="2.6.39" |
82 |
|
83 |
COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1 |
84 |
>=sys-apps/util-linux-2.20 |
85 |
sys-libs/libcap |
86 |
acl? ( sys-apps/acl ) |
87 |
audit? ( >=sys-process/audit-2 ) |
88 |
cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) |
89 |
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) |
90 |
gudev? ( >=dev-libs/glib-2 ) |
91 |
http? ( net-libs/libmicrohttpd ) |
92 |
introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) |
93 |
kmod? ( >=sys-apps/kmod-12 ) |
94 |
lzma? ( app-arch/xz-utils ) |
95 |
pam? ( virtual/pam ) |
96 |
python? ( ${PYTHON_DEPS} ) |
97 |
qrcode? ( media-gfx/qrencode ) |
98 |
selinux? ( sys-libs/libselinux ) |
99 |
tcpd? ( sys-apps/tcp-wrappers ) |
100 |
xattr? ( sys-apps/attr )" |
101 |
|
102 |
# baselayout-2.2 has /run |
103 |
RDEPEND="${COMMON_DEPEND} |
104 |
>=sys-apps/baselayout-2.2 |
105 |
openrc? ( >=sys-fs/udev-init-scripts-25 ) |
106 |
policykit? ( sys-auth/polkit ) |
107 |
|| ( |
108 |
>=sys-apps/util-linux-2.22 |
109 |
<sys-apps/sysvinit-2.88-r4 |
110 |
) |
111 |
!vanilla? ( sys-apps/gentoo-systemd-integration ) |
112 |
!sys-auth/nss-myhostname |
113 |
!<sys-libs/glibc-2.10 |
114 |
!sys-fs/udev" |
115 |
|
116 |
PDEPEND=">=sys-apps/hwids-20130717-r1[udev]" |
117 |
|
118 |
DEPEND="${COMMON_DEPEND} |
119 |
app-arch/xz-utils |
120 |
app-text/docbook-xml-dtd:4.2 |
121 |
app-text/docbook-xsl-stylesheets |
122 |
dev-libs/libxslt |
123 |
dev-util/gperf |
124 |
>=dev-util/intltool-0.50 |
125 |
>=sys-devel/gcc-4.6 |
126 |
>=sys-kernel/linux-headers-${MINKV} |
127 |
virtual/pkgconfig |
128 |
doc? ( >=dev-util/gtk-doc-1.18 )" |
129 |
|
130 |
#if LIVE |
131 |
DEPEND="${DEPEND} |
132 |
dev-libs/gobject-introspection |
133 |
>=dev-libs/libgcrypt-1.4.5 |
134 |
>=dev-util/gtk-doc-1.18" |
135 |
|
136 |
SRC_URI= |
137 |
KEYWORDS= |
138 |
|
139 |
src_prepare() { |
140 |
gtkdocize --docdir docs/ || die |
141 |
|
142 |
autotools-utils_src_prepare |
143 |
} |
144 |
#endif |
145 |
|
146 |
pkg_pretend() { |
147 |
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS |
148 |
~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD |
149 |
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" |
150 |
# ~!FW_LOADER_USER_HELPER" |
151 |
|
152 |
# read null-terminated argv[0] from PID 1 |
153 |
# and see which path to systemd was used (if any) |
154 |
local init_path |
155 |
IFS= read -r -d '' init_path < /proc/1/cmdline |
156 |
if [[ ${init_path} == */bin/systemd ]]; then |
157 |
eerror "You are using a compatibility symlink to run systemd. The symlink" |
158 |
eerror "has been removed. Please update your bootloader to use:" |
159 |
eerror |
160 |
eerror " init=/usr/lib/systemd/systemd" |
161 |
eerror |
162 |
eerror "and reboot your system. We are sorry for the inconvenience." |
163 |
if [[ ${MERGE_TYPE} != buildonly ]]; then |
164 |
die "Compatibility symlink used to boot systemd." |
165 |
fi |
166 |
fi |
167 |
|
168 |
if [[ ${MERGE_TYPE} != binary ]]; then |
169 |
if [[ $(gcc-major-version) -lt 4 |
170 |
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] |
171 |
then |
172 |
eerror "systemd requires at least gcc 4.6 to build. Please switch the active" |
173 |
eerror "gcc version using gcc-config." |
174 |
die "systemd requires at least gcc 4.6" |
175 |
fi |
176 |
fi |
177 |
|
178 |
if [[ ${MERGE_TYPE} != buildonly ]]; then |
179 |
if kernel_is -lt ${MINKV//./ }; then |
180 |
ewarn "Kernel version at least ${MINKV} required" |
181 |
fi |
182 |
|
183 |
if ! use firmware-loader && kernel_is -lt 3 8; then |
184 |
ewarn "You seem to be using kernel older than 3.8. Those kernel versions" |
185 |
ewarn "require systemd with USE=firmware-loader to support loading" |
186 |
ewarn "firmware. Missing this flag may cause some hardware not to work." |
187 |
fi |
188 |
|
189 |
check_extra_config |
190 |
fi |
191 |
} |
192 |
|
193 |
pkg_setup() { |
194 |
use python && python-single-r1_pkg_setup |
195 |
} |
196 |
|
197 |
src_configure() { |
198 |
local myeconfargs=( |
199 |
--localstatedir=/var |
200 |
--with-pamlibdir=$(getpam_mod_dir) |
201 |
# avoid bash-completion dep |
202 |
--with-bashcompletiondir="$(get_bashcompdir)" |
203 |
# make sure we get /bin:/sbin in $PATH |
204 |
--enable-split-usr |
205 |
# disable sysv compatibility |
206 |
--with-sysvinit-path= |
207 |
--with-sysvrcnd-path= |
208 |
# no deps |
209 |
--enable-efi |
210 |
--enable-ima |
211 |
# optional components/dependencies |
212 |
$(use_enable acl) |
213 |
$(use_enable audit) |
214 |
$(use_enable cryptsetup libcryptsetup) |
215 |
$(use_enable doc gtk-doc) |
216 |
$(use_enable gcrypt) |
217 |
$(use_enable gudev) |
218 |
$(use_enable http microhttpd) |
219 |
$(use_enable introspection) |
220 |
$(use_enable kmod) |
221 |
$(use_enable lzma xz) |
222 |
$(use_enable pam) |
223 |
$(use_enable policykit polkit) |
224 |
$(use_with python) |
225 |
$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python}) |
226 |
$(use_enable qrcode qrencode) |
227 |
$(use_enable selinux) |
228 |
$(use_enable tcpd tcpwrap) |
229 |
$(use_enable test tests) |
230 |
$(use_enable xattr) |
231 |
|
232 |
# not supported (avoid automagic deps in the future) |
233 |
--disable-chkconfig |
234 |
|
235 |
# hardcode a few paths to spare some deps |
236 |
QUOTAON=/usr/sbin/quotaon |
237 |
QUOTACHECK=/usr/sbin/quotacheck |
238 |
) |
239 |
|
240 |
# Keep using the one where the rules were installed. |
241 |
MY_UDEVDIR=$(get_udevdir) |
242 |
|
243 |
if use firmware-loader; then |
244 |
myeconfargs+=( |
245 |
--with-firmware-path="/lib/firmware/updates:/lib/firmware" |
246 |
) |
247 |
fi |
248 |
|
249 |
# Work around bug 463846. |
250 |
tc-export CC |
251 |
|
252 |
autotools-utils_src_configure |
253 |
} |
254 |
|
255 |
src_compile() { |
256 |
autotools-utils_src_compile \ |
257 |
udevlibexecdir="${MY_UDEVDIR}" |
258 |
} |
259 |
|
260 |
src_install() { |
261 |
autotools-utils_src_install -j1 \ |
262 |
udevlibexecdir="${MY_UDEVDIR}" \ |
263 |
dist_udevhwdb_DATA= |
264 |
|
265 |
# keep udev working without initramfs, for openrc compat |
266 |
dodir /bin /sbin |
267 |
mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die |
268 |
mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die |
269 |
dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd |
270 |
dosym ../../bin/udevadm /usr/bin/udevadm |
271 |
|
272 |
# zsh completion |
273 |
insinto /usr/share/zsh/site-functions |
274 |
newins shell-completion/systemd-zsh-completion.zsh "_${PN}" |
275 |
|
276 |
# compat for init= use |
277 |
dosym ../usr/lib/systemd/systemd /bin/systemd |
278 |
dosym ../lib/systemd/systemd /usr/bin/systemd |
279 |
# rsyslog.service depends on it... |
280 |
dosym ../usr/bin/systemctl /bin/systemctl |
281 |
|
282 |
# we just keep sysvinit tools, so no need for the mans |
283 |
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
284 |
|| die |
285 |
rm "${D}"/usr/share/man/man1/init.1 || die |
286 |
|
287 |
# Disable storing coredumps in journald, bug #433457 |
288 |
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die |
289 |
|
290 |
# Preserve empty dirs in /etc & /var, bug #437008 |
291 |
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ |
292 |
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd |
293 |
|
294 |
# Check whether we won't break user's system. |
295 |
local x |
296 |
for x in /bin/systemd /usr/bin/systemd \ |
297 |
/usr/bin/udevadm /usr/lib/systemd/systemd-udevd |
298 |
do |
299 |
[[ -x ${D}${x} ]] || die "${x} symlink broken, aborting." |
300 |
done |
301 |
} |
302 |
|
303 |
optfeature() { |
304 |
local i desc=${1} text |
305 |
shift |
306 |
|
307 |
text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" |
308 |
shift |
309 |
|
310 |
for i; do |
311 |
elog "${text}" |
312 |
text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" |
313 |
done |
314 |
elog "${text} (${desc})" |
315 |
} |
316 |
|
317 |
pkg_postinst() { |
318 |
# for udev rules |
319 |
enewgroup dialout |
320 |
|
321 |
enewgroup systemd-journal |
322 |
if use http; then |
323 |
enewgroup systemd-journal-gateway |
324 |
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway |
325 |
fi |
326 |
systemd_update_catalog |
327 |
|
328 |
# Keep this here in case the database format changes so it gets updated |
329 |
# when required. Despite that this file is owned by sys-apps/hwids. |
330 |
if has_version "sys-apps/hwids[udev]"; then |
331 |
udevadm hwdb --update --root="${ROOT%/}" |
332 |
fi |
333 |
|
334 |
# Bug 468876 |
335 |
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt |
336 |
|
337 |
if [[ ! -L "${ROOT}"/etc/mtab ]]; then |
338 |
ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." |
339 |
ewarn "It is known to cause users being unable to unmount user mounts. If you don't" |
340 |
ewarn "require that specific feature, please call:" |
341 |
ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" |
342 |
ewarn |
343 |
fi |
344 |
|
345 |
elog "To get additional features, a number of optional runtime dependencies may" |
346 |
elog "be installed:" |
347 |
optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \ |
348 |
'sys-apps/systemd-ui' |
349 |
} |
350 |
|
351 |
pkg_prerm() { |
352 |
# If removing systemd completely, remove the catalog database. |
353 |
if [[ ! ${REPLACED_BY_VERSION} ]]; then |
354 |
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database |
355 |
fi |
356 |
} |