| 1 |
floppym 15/08/01 15:56:53 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: systemd-224.ebuild |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.394 sys-apps/systemd/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.394&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.394&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.393&r2=1.394 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
| 20 |
retrieving revision 1.393 |
| 21 |
retrieving revision 1.394 |
| 22 |
diff -u -r1.393 -r1.394 |
| 23 |
--- ChangeLog 1 Aug 2015 15:10:12 -0000 1.393 |
| 24 |
+++ ChangeLog 1 Aug 2015 15:56:53 -0000 1.394 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for sys-apps/systemd |
| 27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.393 2015/08/01 15:10:12 floppym Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.394 2015/08/01 15:56:53 floppym Exp $ |
| 30 |
+ |
| 31 |
+*systemd-224 (01 Aug 2015) |
| 32 |
+ |
| 33 |
+ 01 Aug 2015; Mike Gilbert <floppym@g.o> +systemd-224.ebuild: |
| 34 |
+ Version bump. |
| 35 |
|
| 36 |
01 Aug 2015; Mike Gilbert <floppym@g.o> systemd-9999.ebuild: |
| 37 |
Remove code for defunct terminal USE flag. Re-enable networkd to support |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 sys-apps/systemd/systemd-224.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-224.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-224.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: systemd-224.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2015 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-224.ebuild,v 1.1 2015/08/01 15:56:53 floppym Exp $ |
| 51 |
|
| 52 |
EAPI=5 |
| 53 |
|
| 54 |
AUTOTOOLS_AUTORECONF=yes |
| 55 |
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all |
| 56 |
|
| 57 |
if [[ ${PV} == 9999 ]]; then |
| 58 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
| 59 |
inherit git-r3 |
| 60 |
else |
| 61 |
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 62 |
KEYWORDS="~amd64 ~arm ~ia64 ~x86" |
| 63 |
fi |
| 64 |
|
| 65 |
inherit autotools-utils bash-completion-r1 linux-info multilib \ |
| 66 |
multilib-minimal pam systemd toolchain-funcs udev user |
| 67 |
|
| 68 |
DESCRIPTION="System and service manager for Linux" |
| 69 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
| 70 |
|
| 71 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
| 72 |
SLOT="0/2" |
| 73 |
IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http |
| 74 |
idn importd +kdbus +kmod +lz4 lzma nat pam policykit |
| 75 |
qrcode +seccomp selinux ssl sysv-utils test vanilla xkb" |
| 76 |
|
| 77 |
REQUIRED_USE="importd? ( curl gcrypt lzma )" |
| 78 |
|
| 79 |
MINKV="3.8" |
| 80 |
|
| 81 |
COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=[${MULTILIB_USEDEP}] |
| 82 |
sys-libs/libcap:0=[${MULTILIB_USEDEP}] |
| 83 |
!<sys-libs/glibc-2.16 |
| 84 |
acl? ( sys-apps/acl:0= ) |
| 85 |
apparmor? ( sys-libs/libapparmor:0= ) |
| 86 |
audit? ( >=sys-process/audit-2:0= ) |
| 87 |
cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) |
| 88 |
curl? ( net-misc/curl:0= ) |
| 89 |
elfutils? ( >=dev-libs/elfutils-0.158:0= ) |
| 90 |
gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) |
| 91 |
http? ( |
| 92 |
>=net-libs/libmicrohttpd-0.9.33:0= |
| 93 |
ssl? ( >=net-libs/gnutls-3.1.4:0= ) |
| 94 |
) |
| 95 |
idn? ( net-dns/libidn:0= ) |
| 96 |
importd? ( |
| 97 |
app-arch/bzip2:0= |
| 98 |
sys-libs/zlib:0= |
| 99 |
) |
| 100 |
kmod? ( >=sys-apps/kmod-15:0= ) |
| 101 |
lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] ) |
| 102 |
lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) |
| 103 |
nat? ( net-firewall/iptables:0= ) |
| 104 |
pam? ( virtual/pam:= ) |
| 105 |
qrcode? ( media-gfx/qrencode:0= ) |
| 106 |
seccomp? ( sys-libs/libseccomp:0= ) |
| 107 |
selinux? ( sys-libs/libselinux:0= ) |
| 108 |
sysv-utils? ( |
| 109 |
!sys-apps/systemd-sysv-utils |
| 110 |
!sys-apps/sysvinit ) |
| 111 |
xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) |
| 112 |
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 |
| 113 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" |
| 114 |
|
| 115 |
# baselayout-2.2 has /run |
| 116 |
RDEPEND="${COMMON_DEPEND} |
| 117 |
>=sys-apps/baselayout-2.2 |
| 118 |
!sys-auth/nss-myhostname |
| 119 |
!sys-fs/eudev |
| 120 |
!sys-fs/udev" |
| 121 |
|
| 122 |
# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) |
| 123 |
PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd] |
| 124 |
>=sys-apps/hwids-20150417[udev] |
| 125 |
>=sys-fs/udev-init-scripts-25 |
| 126 |
policykit? ( sys-auth/polkit ) |
| 127 |
!vanilla? ( sys-apps/gentoo-systemd-integration )" |
| 128 |
|
| 129 |
# Newer linux-headers needed by ia64, bug #480218 |
| 130 |
DEPEND="${COMMON_DEPEND} |
| 131 |
app-arch/xz-utils:0 |
| 132 |
dev-util/gperf |
| 133 |
>=dev-util/intltool-0.50 |
| 134 |
>=sys-apps/coreutils-8.16 |
| 135 |
>=sys-devel/binutils-2.23.1 |
| 136 |
>=sys-devel/gcc-4.6 |
| 137 |
>=sys-kernel/linux-headers-${MINKV} |
| 138 |
ia64? ( >=sys-kernel/linux-headers-3.9 ) |
| 139 |
virtual/pkgconfig |
| 140 |
gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) |
| 141 |
test? ( >=sys-apps/dbus-1.6.8-r1:0 )" |
| 142 |
|
| 143 |
if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then |
| 144 |
DEPEND+=" |
| 145 |
app-text/docbook-xml-dtd:4.2 |
| 146 |
app-text/docbook-xml-dtd:4.5 |
| 147 |
app-text/docbook-xsl-stylesheets |
| 148 |
dev-libs/libxslt:0 |
| 149 |
>=dev-libs/libgcrypt-1.4.5:0" |
| 150 |
fi |
| 151 |
|
| 152 |
PATCHES=( "${FILESDIR}/218-Dont-enable-audit-by-default.patch" ) |
| 153 |
|
| 154 |
pkg_pretend() { |
| 155 |
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS |
| 156 |
~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE |
| 157 |
~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS |
| 158 |
~TIMERFD ~TMPFS_XATTR |
| 159 |
~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED |
| 160 |
~!SYSFS_DEPRECATED_V2" |
| 161 |
|
| 162 |
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" |
| 163 |
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" |
| 164 |
|
| 165 |
if linux_config_exists; then |
| 166 |
local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
| 167 |
if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
| 168 |
ewarn "It's recommended to set an empty value to the following kernel config option:" |
| 169 |
ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
| 170 |
fi |
| 171 |
fi |
| 172 |
|
| 173 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 174 |
if [[ $(gcc-major-version) -lt 4 |
| 175 |
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] |
| 176 |
then |
| 177 |
eerror "systemd requires at least gcc 4.6 to build. Please switch the active" |
| 178 |
eerror "gcc version using gcc-config." |
| 179 |
die "systemd requires at least gcc 4.6" |
| 180 |
fi |
| 181 |
fi |
| 182 |
|
| 183 |
if [[ ${MERGE_TYPE} != buildonly ]]; then |
| 184 |
if kernel_is -lt ${MINKV//./ }; then |
| 185 |
ewarn "Kernel version at least ${MINKV} required" |
| 186 |
fi |
| 187 |
|
| 188 |
check_extra_config |
| 189 |
fi |
| 190 |
} |
| 191 |
|
| 192 |
pkg_setup() { |
| 193 |
: |
| 194 |
} |
| 195 |
|
| 196 |
src_unpack() { |
| 197 |
default |
| 198 |
[[ ${PV} != 9999 ]] || git-r3_src_unpack |
| 199 |
} |
| 200 |
|
| 201 |
src_prepare() { |
| 202 |
# Bug 463376 |
| 203 |
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die |
| 204 |
|
| 205 |
autotools-utils_src_prepare |
| 206 |
} |
| 207 |
|
| 208 |
src_configure() { |
| 209 |
# Keep using the one where the rules were installed. |
| 210 |
MY_UDEVDIR=$(get_udevdir) |
| 211 |
# Fix systems broken by bug #509454. |
| 212 |
[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev |
| 213 |
|
| 214 |
multilib-minimal_src_configure |
| 215 |
} |
| 216 |
|
| 217 |
multilib_src_configure() { |
| 218 |
local myeconfargs=( |
| 219 |
# disable -flto since it is an optimization flag |
| 220 |
# and makes distcc less effective |
| 221 |
cc_cv_CFLAGS__flto=no |
| 222 |
|
| 223 |
# Workaround for gcc-4.7, bug 554454. |
| 224 |
cc_cv_CFLAGS__Werror_shadow=no |
| 225 |
|
| 226 |
# Workaround for bug 516346 |
| 227 |
--enable-dependency-tracking |
| 228 |
|
| 229 |
--disable-maintainer-mode |
| 230 |
--localstatedir=/var |
| 231 |
--with-pamlibdir=$(getpam_mod_dir) |
| 232 |
# avoid bash-completion dep |
| 233 |
--with-bashcompletiondir="$(get_bashcompdir)" |
| 234 |
# make sure we get /bin:/sbin in $PATH |
| 235 |
--enable-split-usr |
| 236 |
# For testing. |
| 237 |
--with-rootprefix="${ROOTPREFIX-/usr}" |
| 238 |
--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)" |
| 239 |
# disable sysv compatibility |
| 240 |
--with-sysvinit-path= |
| 241 |
--with-sysvrcnd-path= |
| 242 |
# no deps |
| 243 |
--enable-efi |
| 244 |
--enable-ima |
| 245 |
--without-python |
| 246 |
|
| 247 |
# Optional components/dependencies |
| 248 |
$(multilib_native_use_enable acl) |
| 249 |
$(multilib_native_use_enable apparmor) |
| 250 |
$(multilib_native_use_enable audit) |
| 251 |
$(multilib_native_use_enable cryptsetup libcryptsetup) |
| 252 |
$(multilib_native_use_enable curl libcurl) |
| 253 |
$(multilib_native_use_enable elfutils) |
| 254 |
$(use_enable gcrypt) |
| 255 |
$(multilib_native_use_enable gnuefi) |
| 256 |
$(multilib_native_use_enable http microhttpd) |
| 257 |
$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls) |
| 258 |
$(multilib_native_use_enable idn libidn) |
| 259 |
$(multilib_native_use_enable importd) |
| 260 |
$(multilib_native_use_enable importd bzip2) |
| 261 |
$(multilib_native_use_enable importd zlib) |
| 262 |
$(use_enable kdbus) |
| 263 |
$(multilib_native_use_enable kmod) |
| 264 |
$(use_enable lz4) |
| 265 |
$(use_enable lzma xz) |
| 266 |
$(multilib_native_use_enable nat libiptc) |
| 267 |
$(multilib_native_use_enable pam) |
| 268 |
$(multilib_native_use_enable policykit polkit) |
| 269 |
$(multilib_native_use_enable qrcode qrencode) |
| 270 |
$(multilib_native_use_enable seccomp) |
| 271 |
$(multilib_native_use_enable selinux) |
| 272 |
$(multilib_native_use_enable test tests) |
| 273 |
$(multilib_native_use_enable test dbus) |
| 274 |
$(multilib_native_use_enable xkb xkbcommon) |
| 275 |
|
| 276 |
# hardcode a few paths to spare some deps |
| 277 |
QUOTAON=/usr/sbin/quotaon |
| 278 |
QUOTACHECK=/usr/sbin/quotacheck |
| 279 |
|
| 280 |
# TODO: we may need to restrict this to gcc |
| 281 |
EFI_CC="$(tc-getCC)" |
| 282 |
|
| 283 |
# dbus paths |
| 284 |
--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" |
| 285 |
--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" |
| 286 |
--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" |
| 287 |
|
| 288 |
--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" |
| 289 |
) |
| 290 |
|
| 291 |
# Work around bug 463846. |
| 292 |
tc-export CC |
| 293 |
|
| 294 |
autotools-utils_src_configure |
| 295 |
} |
| 296 |
|
| 297 |
multilib_src_compile() { |
| 298 |
local mymakeopts=( |
| 299 |
udevlibexecdir="${MY_UDEVDIR}" |
| 300 |
) |
| 301 |
|
| 302 |
if multilib_is_native_abi; then |
| 303 |
emake "${mymakeopts[@]}" |
| 304 |
else |
| 305 |
echo 'gentoo: $(BUILT_SOURCES)' | \ |
| 306 |
emake "${mymakeopts[@]}" -f Makefile -f - gentoo |
| 307 |
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ |
| 308 |
emake "${mymakeopts[@]}" -f Makefile -f - gentoo |
| 309 |
fi |
| 310 |
} |
| 311 |
|
| 312 |
multilib_src_test() { |
| 313 |
multilib_is_native_abi || continue |
| 314 |
|
| 315 |
default |
| 316 |
} |
| 317 |
|
| 318 |
multilib_src_install() { |
| 319 |
local mymakeopts=( |
| 320 |
# automake fails with parallel libtool relinking |
| 321 |
# https://bugs.gentoo.org/show_bug.cgi?id=491398 |
| 322 |
-j1 |
| 323 |
|
| 324 |
udevlibexecdir="${MY_UDEVDIR}" |
| 325 |
dist_udevhwdb_DATA= |
| 326 |
DESTDIR="${D}" |
| 327 |
) |
| 328 |
|
| 329 |
if multilib_is_native_abi; then |
| 330 |
emake "${mymakeopts[@]}" install |
| 331 |
else |
| 332 |
mymakeopts+=( |
| 333 |
install-libLTLIBRARIES |
| 334 |
install-pkgconfiglibDATA |
| 335 |
install-includeHEADERS |
| 336 |
# safe to call unconditionally, 'installs' empty list |
| 337 |
install-pkgincludeHEADERS |
| 338 |
) |
| 339 |
|
| 340 |
emake "${mymakeopts[@]}" |
| 341 |
fi |
| 342 |
|
| 343 |
# install compat pkg-config files |
| 344 |
# Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped. |
| 345 |
local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc ) |
| 346 |
emake "${mymakeopts[@]}" install-pkgconfiglibDATA \ |
| 347 |
pkgconfiglib_DATA="${pcfiles[*]}" |
| 348 |
} |
| 349 |
|
| 350 |
multilib_src_install_all() { |
| 351 |
prune_libtool_files --modules |
| 352 |
einstalldocs |
| 353 |
|
| 354 |
if use sysv-utils; then |
| 355 |
for app in halt poweroff reboot runlevel shutdown telinit; do |
| 356 |
dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} |
| 357 |
done |
| 358 |
dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init |
| 359 |
else |
| 360 |
# we just keep sysvinit tools, so no need for the mans |
| 361 |
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
| 362 |
|| die |
| 363 |
rm "${D}"/usr/share/man/man1/init.1 || die |
| 364 |
fi |
| 365 |
|
| 366 |
# Disable storing coredumps in journald, bug #433457 |
| 367 |
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die |
| 368 |
|
| 369 |
# Preserve empty dirs in /etc & /var, bug #437008 |
| 370 |
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ |
| 371 |
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ |
| 372 |
/var/log/journal/remote |
| 373 |
|
| 374 |
# Symlink /etc/sysctl.conf for easy migration. |
| 375 |
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |
| 376 |
|
| 377 |
# If we install these symlinks, there is no way for the sysadmin to remove them |
| 378 |
# permanently. |
| 379 |
rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die |
| 380 |
rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die |
| 381 |
rm -r "${D}"/etc/systemd/system/network-online.target.wants || die |
| 382 |
rm -r "${D}"/etc/systemd/system/sockets.target.wants || die |
| 383 |
rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die |
| 384 |
} |
| 385 |
|
| 386 |
migrate_locale() { |
| 387 |
local envd_locale_def="${EROOT%/}/etc/env.d/02locale" |
| 388 |
local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) |
| 389 |
local locale_conf="${EROOT%/}/etc/locale.conf" |
| 390 |
|
| 391 |
if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then |
| 392 |
# If locale.conf does not exist... |
| 393 |
if [[ -e ${envd_locale} ]]; then |
| 394 |
# ...either copy env.d/??locale if there's one |
| 395 |
ebegin "Moving ${envd_locale} to ${locale_conf}" |
| 396 |
mv "${envd_locale}" "${locale_conf}" |
| 397 |
eend ${?} || FAIL=1 |
| 398 |
else |
| 399 |
# ...or create a dummy default |
| 400 |
ebegin "Creating ${locale_conf}" |
| 401 |
cat > "${locale_conf}" <<-EOF |
| 402 |
# This file has been created by the sys-apps/systemd ebuild. |
| 403 |
# See locale.conf(5) and localectl(1). |
| 404 |
|
| 405 |
# LANG=${LANG} |
| 406 |
EOF |
| 407 |
eend ${?} || FAIL=1 |
| 408 |
fi |
| 409 |
fi |
| 410 |
|
| 411 |
if [[ ! -L ${envd_locale} ]]; then |
| 412 |
# now, if env.d/??locale is not a symlink (to locale.conf)... |
| 413 |
if [[ -e ${envd_locale} ]]; then |
| 414 |
# ...warn the user that he has duplicate locale settings |
| 415 |
ewarn |
| 416 |
ewarn "To ensure consistent behavior, you should replace ${envd_locale}" |
| 417 |
ewarn "with a symlink to ${locale_conf}. Please migrate your settings" |
| 418 |
ewarn "and create the symlink with the following command:" |
| 419 |
ewarn "ln -s -n -f ../locale.conf ${envd_locale}" |
| 420 |
ewarn |
| 421 |
else |
| 422 |
# ...or just create the symlink if there's nothing here |
| 423 |
ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" |
| 424 |
ln -n -s ../locale.conf "${envd_locale_def}" |
| 425 |
eend ${?} || FAIL=1 |
| 426 |
fi |
| 427 |
fi |
| 428 |
} |
| 429 |
|
| 430 |
migrate_net_name_slot() { |
| 431 |
# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, |
| 432 |
# do the same for 80-net-setup-link.rules to keep the old behavior |
| 433 |
local net_move=no |
| 434 |
local net_name_slot_sym=no |
| 435 |
local net_rules_path="${EROOT%/}"/etc/udev/rules.d |
| 436 |
local net_name_slot="${net_rules_path}"/80-net-name-slot.rules |
| 437 |
local net_setup_link="${net_rules_path}"/80-net-setup-link.rules |
| 438 |
if [[ -e ${net_setup_link} ]]; then |
| 439 |
net_move=no |
| 440 |
elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then |
| 441 |
net_move=yes |
| 442 |
elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then |
| 443 |
net_move=yes |
| 444 |
net_name_slot_sym=yes |
| 445 |
fi |
| 446 |
if [[ ${net_move} == yes ]]; then |
| 447 |
ebegin "Copying ${net_name_slot} to ${net_setup_link}" |
| 448 |
|
| 449 |
if [[ ${net_name_slot_sym} == yes ]]; then |
| 450 |
ln -nfs /dev/null "${net_setup_link}" |
| 451 |
else |
| 452 |
cp "${net_name_slot}" "${net_setup_link}" |
| 453 |
fi |
| 454 |
eend $? || FAIL=1 |
| 455 |
fi |
| 456 |
} |
| 457 |
|
| 458 |
reenable_unit() { |
| 459 |
if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then |
| 460 |
ebegin "Re-enabling $1" |
| 461 |
systemctl reenable --root="${ROOT}" "$1" |
| 462 |
eend $? || FAIL=1 |
| 463 |
fi |
| 464 |
} |
| 465 |
|
| 466 |
pkg_postinst() { |
| 467 |
newusergroup() { |
| 468 |
enewgroup "$1" |
| 469 |
enewuser "$1" -1 -1 -1 "$1" |
| 470 |
} |
| 471 |
|
| 472 |
enewgroup input |
| 473 |
enewgroup systemd-journal |
| 474 |
newusergroup systemd-bus-proxy |
| 475 |
newusergroup systemd-journal-gateway |
| 476 |
newusergroup systemd-journal-remote |
| 477 |
newusergroup systemd-journal-upload |
| 478 |
newusergroup systemd-network |
| 479 |
newusergroup systemd-resolve |
| 480 |
newusergroup systemd-timesync |
| 481 |
use http && newusergroup systemd-journal-gateway |
| 482 |
|
| 483 |
systemd_update_catalog |
| 484 |
|
| 485 |
# Keep this here in case the database format changes so it gets updated |
| 486 |
# when required. Despite that this file is owned by sys-apps/hwids. |
| 487 |
if has_version "sys-apps/hwids[udev]"; then |
| 488 |
udevadm hwdb --update --root="${ROOT%/}" |
| 489 |
fi |
| 490 |
|
| 491 |
udev_reload || FAIL=1 |
| 492 |
|
| 493 |
# Bug 465468, make sure locales are respect, and ensure consistency |
| 494 |
# between OpenRC & systemd |
| 495 |
migrate_locale |
| 496 |
|
| 497 |
# Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules |
| 498 |
migrate_net_name_slot |
| 499 |
|
| 500 |
# Re-enable systemd-networkd for socket activation |
| 501 |
reenable_unit systemd-networkd.service |
| 502 |
|
| 503 |
if [[ ${FAIL} ]]; then |
| 504 |
eerror "One of the postinst commands failed. Please check the postinst output" |
| 505 |
eerror "for errors. You may need to clean up your system and/or try installing" |
| 506 |
eerror "systemd again." |
| 507 |
eerror |
| 508 |
fi |
| 509 |
|
| 510 |
if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then |
| 511 |
ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable" |
| 512 |
ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf" |
| 513 |
ewarn "to /run/systemd/resolve/resolv.conf" |
| 514 |
ewarn |
| 515 |
fi |
| 516 |
} |
| 517 |
|
| 518 |
pkg_prerm() { |
| 519 |
# If removing systemd completely, remove the catalog database. |
| 520 |
if [[ ! ${REPLACED_BY_VERSION} ]]; then |
| 521 |
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database |
| 522 |
fi |
| 523 |
} |
Archives