diff options
| author |   Jason A. Donenfeld <zx2c4@gentoo.org> | 2014-02-21 15:40:01 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2014-02-21 15:40:01 +0000 |
| commit | 2375770e296885509cf45acab684f611980dbb69 (patch) | |
| tree | d67550b7532c1846afe458d079b1253f0875ec44 /sys-apps/systemd | |
| parent | dev-lang/ifc: Version Bump, #500386 (diff) | |
| download | gentoo-2-2375770e296885509cf45acab684f611980dbb69.tar.gz gentoo-2-2375770e296885509cf45acab684f611980dbb69.tar.bz2 gentoo-2-2375770e296885509cf45acab684f611980dbb69.zip | |
Introduce networkd use flag.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A5DE03AE)
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/systemd/metadata.xml | 1 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 11 |
3 files changed, 14 insertions, 4 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index a110efd1d885..313e991d2378 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.220 2014/02/21 03:19:33 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.221 2014/02/21 15:40:01 zx2c4 Exp $ + + 21 Feb 2014; Jason A. Donenfeld <zx2c4@gentoo.org> metadata.xml, + systemd-9999.ebuild: + Introduce networkd use flag. 21 Feb 2014; Jason A. Donenfeld <zx2c4@gentoo.org> systemd-9999.ebuild: Compat libs for 9999. diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index bc4bb2f8b822..b0c4b1183ba5 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -16,6 +16,7 @@ <flag name="keymap">Map custom hardware's multimedia keys</flag> <flag name='kdbus'>Connect to kernel dbus (KDBUS) instead of userspace dbus if available</flag> <flag name='kmod'>Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag> + <flag name='networkd'>Enable systemd's built-in network management daemon</flag> <flag name='openrc'>Depend on <pkg>sys-fs/udev-init-scripts</pkg></flag> <flag name='qrcode'>Enable qrcode output support in journal</flag> <flag name='seccomp'>Enable system call filtering via seccomp</flag> diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index cd0d6f01e098..76f5b08d82ae 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.85 2014/02/21 03:19:33 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.86 2014/02/21 15:40:01 zx2c4 Exp $ EAPI=5 @@ -26,8 +26,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/1" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection - kdbus +kmod lzma pam policykit python qrcode +seccomp selinux tcpd test - vanilla xattr" + kdbus +kmod lzma networkd pam policykit python qrcode +seccomp selinux tcpd + test vanilla xattr" MINKV="3.0" @@ -187,6 +187,7 @@ multilib_src_configure() { $(use_enable kdbus) $(use_enable kmod) $(use_enable lzma xz) + $(use_enable networkd) $(use_enable pam) $(use_enable policykit polkit) $(use_enable python python-devel) @@ -230,6 +231,7 @@ multilib_src_configure() { --disable-kmod --disable-libcryptsetup --disable-microhttpd + --disable-networkd --disable-pam --disable-polkit --disable-qrencode @@ -286,6 +288,9 @@ multilib_src_install() { if multilib_is_native_abi; then emake "${mymakeopts[@]}" install + # Even with --enable-networkd, it's not right to have this running by default + # when it's unconfigured. + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service else mymakeopts+=( install-libLTLIBRARIES |