Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-217.ebuild systemd-9999.ebuild metadata.xml ChangeLog
Date: Thu, 30 Oct 2014 08:47:36
Message-Id: 20141030084731.91F1690DF@oystercatcher.gentoo.org
1 mgorny 14/10/30 08:47:31
2
3 Modified: systemd-9999.ebuild metadata.xml ChangeLog
4 Added: systemd-217.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
9
10 Revision Changes Path
11 1.145 sys-apps/systemd/systemd-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.145&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.145&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.144&r2=1.145
16
17 Index: systemd-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
20 retrieving revision 1.144
21 retrieving revision 1.145
22 diff -u -r1.144 -r1.145
23 --- systemd-9999.ebuild 22 Oct 2014 15:02:44 -0000 1.144
24 +++ systemd-9999.ebuild 30 Oct 2014 08:47:31 -0000 1.145
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.144 2014/10/22 15:02:44 floppym Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.145 2014/10/30 08:47:31 mgorny Exp $
30
31 EAPI=5
32
33 @@ -27,9 +27,9 @@
34 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
35 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
36 idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
37 - selinux ssl test vanilla"
38 + selinux ssl terminal test vanilla"
39
40 -MINKV="3.7"
41 +MINKV="3.8"
42
43 COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
44 sys-libs/libcap:0=
45 @@ -55,6 +55,9 @@
46 qrcode? ( media-gfx/qrencode:0= )
47 seccomp? ( sys-libs/libseccomp:0= )
48 selinux? ( sys-libs/libselinux:0= )
49 + terminal? ( dev-libs/libevdev:0=
50 + >=x11-libs/libxkbcommon-0.4:0=
51 + x11-libs/libdrm:0= )
52 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
53 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
54
55 @@ -228,6 +231,7 @@
56 $(multilib_native_use_enable qrcode qrencode)
57 $(multilib_native_use_enable seccomp)
58 $(multilib_native_use_enable selinux)
59 + $(multilib_native_use_enable terminal)
60 $(multilib_native_use_enable test tests)
61 $(multilib_native_use_enable test dbus)
62
63 @@ -237,6 +241,7 @@
64 $(multilib_native_enable bootchart)
65 $(multilib_native_enable coredump)
66 $(multilib_native_enable firstboot)
67 + $(multilib_native_enable hibernate)
68 $(multilib_native_enable hostnamed)
69 $(multilib_native_enable localed)
70 $(multilib_native_enable logind)
71 @@ -244,7 +249,6 @@
72 $(multilib_native_enable networkd)
73 $(multilib_native_enable quotacheck)
74 $(multilib_native_enable randomseed)
75 - $(multilib_native_enable readahead)
76 $(multilib_native_enable resolved)
77 $(multilib_native_enable rfkill)
78 $(multilib_native_enable sysusers)
79
80
81
82 1.31 sys-apps/systemd/metadata.xml
83
84 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.31&view=markup
85 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.31&content-type=text/plain
86 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?r1=1.30&r2=1.31
87
88 Index: metadata.xml
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/metadata.xml,v
91 retrieving revision 1.30
92 retrieving revision 1.31
93 diff -u -r1.30 -r1.31
94 --- metadata.xml 19 Oct 2014 20:30:21 -0000 1.30
95 +++ metadata.xml 30 Oct 2014 08:47:31 -0000 1.31
96 @@ -19,6 +19,7 @@
97 <flag name='lz4'>Enable lz4 compression for the journal</flag>
98 <flag name='qrcode'>Enable qrcode output support in journal</flag>
99 <flag name='seccomp'>Enable system call filtering via seccomp</flag>
100 + <flag name='terminal'>Enable experimental userspace virtual terminal support</flag>
101 <flag name='vanilla'>Disable Gentoo-specific behavior and compatibility quirks</flag>
102 </use>
103 </pkgmetadata>
104
105
106
107 1.318 sys-apps/systemd/ChangeLog
108
109 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.318&view=markup
110 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.318&content-type=text/plain
111 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.317&r2=1.318
112
113 Index: ChangeLog
114 ===================================================================
115 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
116 retrieving revision 1.317
117 retrieving revision 1.318
118 diff -u -r1.317 -r1.318
119 --- ChangeLog 22 Oct 2014 15:02:44 -0000 1.317
120 +++ ChangeLog 30 Oct 2014 08:47:31 -0000 1.318
121 @@ -1,6 +1,13 @@
122 # ChangeLog for sys-apps/systemd
123 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
124 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.317 2014/10/22 15:02:44 floppym Exp $
125 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.318 2014/10/30 08:47:31 mgorny Exp $
126 +
127 +*systemd-217 (30 Oct 2014)
128 +
129 + 30 Oct 2014; Michał Górny <mgorny@g.o>
130 + +files/217-systemd-consoled.service.in, +systemd-217.ebuild, metadata.xml,
131 + systemd-9999.ebuild:
132 + Version bump.
133
134 22 Oct 2014; Mike Gilbert <floppym@g.o> systemd-216-r1.ebuild,
135 systemd-9999.ebuild:
136
137
138
139 1.1 sys-apps/systemd/systemd-217.ebuild
140
141 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-217.ebuild?rev=1.1&view=markup
142 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-217.ebuild?rev=1.1&content-type=text/plain
143
144 Index: systemd-217.ebuild
145 ===================================================================
146 # Copyright 1999-2014 Gentoo Foundation
147 # Distributed under the terms of the GNU General Public License v2
148 # $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-217.ebuild,v 1.1 2014/10/30 08:47:31 mgorny Exp $
149
150 EAPI=5
151
152 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
153 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
154 inherit autotools-utils bash-completion-r1 linux-info multilib \
155 multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
156 user
157
158 DESCRIPTION="System and service manager for Linux"
159 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
160 SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
161
162 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
163 SLOT="0/2"
164 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
165 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
166 idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
167 selinux ssl terminal test vanilla"
168
169 MINKV="3.8"
170
171 COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
172 sys-libs/libcap:0=
173 acl? ( sys-apps/acl:0= )
174 apparmor? ( sys-libs/libapparmor:0= )
175 audit? ( >=sys-process/audit-2:0= )
176 cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
177 curl? ( net-misc/curl:0= )
178 elfutils? ( >=dev-libs/elfutils-0.158:0= )
179 gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
180 gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
181 http? (
182 >=net-libs/libmicrohttpd-0.9.33:0=
183 ssl? ( >=net-libs/gnutls-3.1.4:0= )
184 )
185 idn? ( net-dns/libidn:0= )
186 introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
187 kmod? ( >=sys-apps/kmod-15:0= )
188 lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] )
189 lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
190 pam? ( virtual/pam:= )
191 python? ( ${PYTHON_DEPS} )
192 qrcode? ( media-gfx/qrencode:0= )
193 seccomp? ( sys-libs/libseccomp:0= )
194 selinux? ( sys-libs/libselinux:0= )
195 terminal? ( dev-libs/libevdev:0=
196 >=x11-libs/libxkbcommon-0.4:0=
197 x11-libs/libdrm:0= )
198 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
199 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
200
201 # baselayout-2.2 has /run
202 RDEPEND="${COMMON_DEPEND}
203 >=sys-apps/baselayout-2.2
204 || (
205 >=sys-apps/util-linux-2.22
206 <sys-apps/sysvinit-2.88-r4
207 )
208 !sys-auth/nss-myhostname
209 !<sys-libs/glibc-2.14
210 !sys-fs/udev"
211
212 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
213 PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd]
214 >=sys-apps/hwids-20130717-r1[udev]
215 >=sys-fs/udev-init-scripts-25
216 policykit? ( sys-auth/polkit )
217 !vanilla? ( sys-apps/gentoo-systemd-integration )"
218
219 # Newer linux-headers needed by ia64, bug #480218
220 DEPEND="${COMMON_DEPEND}
221 app-arch/xz-utils:0
222 dev-util/gperf
223 >=dev-util/intltool-0.50
224 >=sys-apps/coreutils-8.16
225 >=sys-devel/binutils-2.23.1
226 >=sys-devel/gcc-4.6
227 >=sys-kernel/linux-headers-${MINKV}
228 ia64? ( >=sys-kernel/linux-headers-3.9 )
229 virtual/pkgconfig
230 doc? ( >=dev-util/gtk-doc-1.18 )
231 python? ( dev-python/lxml[${PYTHON_USEDEP}] )
232 test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
233
234 src_prepare() {
235 # Bug 463376
236 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
237
238 # missing in tarball
239 cp "${FILESDIR}"/217-systemd-consoled.service.in \
240 units/user/systemd-consoled.service.in || die
241
242 autotools-utils_src_prepare
243 }
244
245 pkg_pretend() {
246 local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
247 ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
248 ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR
249 ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
250 ~!GRKERNSEC_PROC ~!FW_LOADER_USER_HELPER"
251
252 use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
253 kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
254
255 if linux_config_exists; then
256 local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
257 if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
258 ewarn "It's recommended to set an empty value to the following kernel config option:"
259 ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
260 fi
261 fi
262
263 if [[ ${MERGE_TYPE} != binary ]]; then
264 if [[ $(gcc-major-version) -lt 4
265 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
266 then
267 eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
268 eerror "gcc version using gcc-config."
269 die "systemd requires at least gcc 4.6"
270 fi
271 fi
272
273 if [[ ${MERGE_TYPE} != buildonly ]]; then
274 if kernel_is -lt ${MINKV//./ }; then
275 ewarn "Kernel version at least ${MINKV} required"
276 fi
277
278 check_extra_config
279 fi
280 }
281
282 pkg_setup() {
283 use python && python-single-r1_pkg_setup
284 }
285
286 src_configure() {
287 # Keep using the one where the rules were installed.
288 MY_UDEVDIR=$(get_udevdir)
289 # Fix systems broken by bug #509454.
290 [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
291
292 multilib-minimal_src_configure
293 }
294
295 multilib_native_enable() {
296 if multilib_is_native_abi; then
297 echo "--enable-${1}"
298 else
299 echo "--disable-${1}"
300 fi
301 }
302
303 multilib_src_configure() {
304 local myeconfargs=(
305 # disable -flto since it is an optimization flag
306 # and makes distcc less effective
307 cc_cv_CFLAGS__flto=no
308
309 # Workaround for bug 516346
310 --enable-dependency-tracking
311
312 --disable-maintainer-mode
313 --localstatedir=/var
314 --with-pamlibdir=$(getpam_mod_dir)
315 # avoid bash-completion dep
316 --with-bashcompletiondir="$(get_bashcompdir)"
317 # make sure we get /bin:/sbin in $PATH
318 --enable-split-usr
319 # For testing.
320 --with-rootprefix="${ROOTPREFIX-/usr}"
321 --with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
322 # disable sysv compatibility
323 --with-sysvinit-path=
324 --with-sysvrcnd-path=
325 # no deps
326 --enable-efi
327 --enable-ima
328
329 # Optional components/dependencies
330 $(multilib_native_use_enable acl)
331 $(multilib_native_use_enable apparmor)
332 $(multilib_native_use_enable audit)
333 $(multilib_native_use_enable cryptsetup libcryptsetup)
334 $(multilib_native_use_enable curl libcurl)
335 $(multilib_native_use_enable doc gtk-doc)
336 $(multilib_native_use_enable elfutils)
337 $(use_enable gcrypt)
338 $(use_enable gudev)
339 $(multilib_native_use_enable http microhttpd)
340 $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
341 $(multilib_native_use_enable idn libidn)
342 $(multilib_native_use_enable introspection)
343 $(use_enable kdbus)
344 $(multilib_native_use_enable kmod)
345 $(use_enable lz4)
346 $(use_enable lzma xz)
347 $(multilib_native_use_enable pam)
348 $(multilib_native_use_enable policykit polkit)
349 $(multilib_native_use_with python)
350 $(multilib_native_use_enable python python-devel)
351 $(multilib_native_use_enable qrcode qrencode)
352 $(multilib_native_use_enable seccomp)
353 $(multilib_native_use_enable selinux)
354 $(multilib_native_use_enable terminal)
355 $(multilib_native_use_enable test tests)
356 $(multilib_native_use_enable test dbus)
357
358 # Disable optional binaries for non-native abis
359 $(multilib_native_enable backlight)
360 $(multilib_native_enable binfmt)
361 $(multilib_native_enable bootchart)
362 $(multilib_native_enable coredump)
363 $(multilib_native_enable firstboot)
364 $(multilib_native_enable hibernate)
365 $(multilib_native_enable hostnamed)
366 $(multilib_native_enable localed)
367 $(multilib_native_enable logind)
368 $(multilib_native_enable machined)
369 $(multilib_native_enable networkd)
370 $(multilib_native_enable quotacheck)
371 $(multilib_native_enable randomseed)
372 $(multilib_native_enable resolved)
373 $(multilib_native_enable rfkill)
374 $(multilib_native_enable sysusers)
375 $(multilib_native_enable timedated)
376 $(multilib_native_enable timesyncd)
377 $(multilib_native_enable tmpfiles)
378 $(multilib_native_enable vconsole)
379
380 # not supported (avoid automagic deps in the future)
381 --disable-chkconfig
382
383 # hardcode a few paths to spare some deps
384 QUOTAON=/usr/sbin/quotaon
385 QUOTACHECK=/usr/sbin/quotacheck
386
387 # dbus paths
388 --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
389 --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
390 --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
391 --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
392
393 --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
394 )
395
396 if ! multilib_is_native_abi; then
397 myeconfargs+=(
398 ac_cv_search_cap_init=
399 ac_cv_header_sys_capability_h=yes
400 )
401 fi
402
403 # Work around bug 463846.
404 tc-export CC
405
406 autotools-utils_src_configure
407 }
408
409 multilib_src_compile() {
410 local mymakeopts=(
411 udevlibexecdir="${MY_UDEVDIR}"
412 )
413
414 if multilib_is_native_abi; then
415 emake "${mymakeopts[@]}"
416 else
417 # prerequisites for gudev
418 use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
419
420 echo 'gentoo: $(BUILT_SOURCES)' | \
421 emake "${mymakeopts[@]}" -f Makefile -f - gentoo
422 echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
423 emake "${mymakeopts[@]}" -f Makefile -f - gentoo
424 fi
425 }
426
427 multilib_src_test() {
428 multilib_is_native_abi || continue
429
430 default
431 }
432
433 multilib_src_install() {
434 local mymakeopts=(
435 # automake fails with parallel libtool relinking
436 # https://bugs.gentoo.org/show_bug.cgi?id=491398
437 -j1
438
439 udevlibexecdir="${MY_UDEVDIR}"
440 dist_udevhwdb_DATA=
441 DESTDIR="${D}"
442 )
443
444 if multilib_is_native_abi; then
445 emake "${mymakeopts[@]}" install
446 else
447 mymakeopts+=(
448 install-libLTLIBRARIES
449 install-pkgconfiglibDATA
450 install-includeHEADERS
451 # safe to call unconditionally, 'installs' empty list
452 install-libgudev_includeHEADERS
453 install-pkgincludeHEADERS
454 )
455
456 emake "${mymakeopts[@]}"
457 fi
458
459 # install compat pkg-config files
460 # Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped.
461 local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
462 emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
463 pkgconfiglib_DATA="${pcfiles[*]}"
464 }
465
466 multilib_src_install_all() {
467 prune_libtool_files --modules
468 einstalldocs
469
470 # we just keep sysvinit tools, so no need for the mans
471 rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
472 || die
473 rm "${D}"/usr/share/man/man1/init.1 || die
474
475 # Disable storing coredumps in journald, bug #433457
476 mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
477
478 # Preserve empty dirs in /etc & /var, bug #437008
479 keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
480 /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
481 /var/log/journal/remote
482
483 # Symlink /etc/sysctl.conf for easy migration.
484 dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
485
486 # If we install these symlinks, there is no way for the sysadmin to remove them
487 # permanently.
488 rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
489 rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
490 rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
491 rm -rf "${D}"/etc/systemd/system/network-online.target.wants
492 }
493
494 migrate_locale() {
495 local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
496 local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
497 local locale_conf="${EROOT%/}/etc/locale.conf"
498
499 if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
500 # If locale.conf does not exist...
501 if [[ -e ${envd_locale} ]]; then
502 # ...either copy env.d/??locale if there's one
503 ebegin "Moving ${envd_locale} to ${locale_conf}"
504 mv "${envd_locale}" "${locale_conf}"
505 eend ${?} || FAIL=1
506 else
507 # ...or create a dummy default
508 ebegin "Creating ${locale_conf}"
509 cat > "${locale_conf}" <<-EOF
510 # This file has been created by the sys-apps/systemd ebuild.
511 # See locale.conf(5) and localectl(1).
512
513 # LANG=${LANG}
514 EOF
515 eend ${?} || FAIL=1
516 fi
517 fi
518
519 if [[ ! -L ${envd_locale} ]]; then
520 # now, if env.d/??locale is not a symlink (to locale.conf)...
521 if [[ -e ${envd_locale} ]]; then
522 # ...warn the user that he has duplicate locale settings
523 ewarn
524 ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
525 ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
526 ewarn "and create the symlink with the following command:"
527 ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
528 ewarn
529 else
530 # ...or just create the symlink if there's nothing here
531 ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
532 ln -n -s ../locale.conf "${envd_locale_def}"
533 eend ${?} || FAIL=1
534 fi
535 fi
536 }
537
538 migrate_net_name_slot() {
539 # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
540 # do the same for 80-net-setup-link.rules to keep the old behavior
541 local net_move=no
542 local net_name_slot_sym=no
543 local net_rules_path="${EROOT%/}"/etc/udev/rules.d
544 local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
545 local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
546 if [[ -e ${net_setup_link} ]]; then
547 net_move=no
548 elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
549 net_move=yes
550 elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
551 net_move=yes
552 net_name_slot_sym=yes
553 fi
554 if [[ ${net_move} == yes ]]; then
555 ebegin "Copying ${net_name_slot} to ${net_setup_link}"
556
557 if [[ ${net_name_slot_sym} == yes ]]; then
558 ln -nfs /dev/null "${net_setup_link}"
559 else
560 cp "${net_name_slot}" "${net_setup_link}"
561 fi
562 eend $? || FAIL=1
563 fi
564 }
565
566 pkg_postinst() {
567 newusergroup() {
568 enewgroup "$1"
569 enewuser "$1" -1 -1 -1 "$1"
570 }
571
572 enewgroup input
573 enewgroup systemd-journal
574 newusergroup systemd-bus-proxy
575 newusergroup systemd-journal-gateway
576 newusergroup systemd-journal-remote
577 newusergroup systemd-journal-upload
578 newusergroup systemd-network
579 newusergroup systemd-resolve
580 newusergroup systemd-timesync
581 use http && newusergroup systemd-journal-gateway
582
583 systemd_update_catalog
584
585 # Keep this here in case the database format changes so it gets updated
586 # when required. Despite that this file is owned by sys-apps/hwids.
587 if has_version "sys-apps/hwids[udev]"; then
588 udevadm hwdb --update --root="${ROOT%/}"
589 fi
590
591 udev_reload || FAIL=1
592
593 # Bug 465468, make sure locales are respect, and ensure consistency
594 # between OpenRC & systemd
595 migrate_locale
596
597 # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
598 migrate_net_name_slot
599
600 if [[ ${FAIL} ]]; then
601 eerror "One of the postinst commands failed. Please check the postinst output"
602 eerror "for errors. You may need to clean up your system and/or try installing"
603 eerror "systemd again."
604 eerror
605 fi
606
607 if [[ ! -L "${ROOT}"/etc/mtab ]]; then
608 ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
609 ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
610 ewarn "and 'mount' to not work properly. Please run:"
611 ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
612 ewarn
613 fi
614
615 if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then
616 ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable"
617 ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf"
618 ewarn "to /run/systemd/resolve/resolv.conf"
619 ewarn
620 fi
621
622 if ! has_version sys-apps/systemd-ui; then
623 elog "To get additional features, a number of optional runtime dependencies may"
624 elog "be installed:"
625 elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
626 fi
627
628 if has_version sys-apps/openrc &&
629 ! has_version sys-fs/udev-init-scripts; then
630 elog "If you plan to boot using OpenRC and udev or eudev, you"
631 elog "need to install the udev-init-scripts package."
632 fi
633 }
634
635 pkg_prerm() {
636 # If removing systemd completely, remove the catalog database.
637 if [[ ! ${REPLACED_BY_VERSION} ]]; then
638 rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
639 fi
640 }