From c407a33fe8d808e4c1c6a15a524de179e658c696 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Wed, 13 Apr 2016 15:58:12 +0000 Subject: Select networking manager with VIRTUAL-RUNTIME_net_manager at distro level This variable allows to select the network manager daemon to use in the distro. Possible values are: systemd, connman. Later, it's possible to add other network daemons as well. Change-Id: I4085b4459d3ea110513f6ca9b921c5da92a7d745 Signed-off-by: Stephane Desneux --- meta-agl/recipes-core/systemd/systemd_%.bbappend | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'meta-agl/recipes-core/systemd') diff --git a/meta-agl/recipes-core/systemd/systemd_%.bbappend b/meta-agl/recipes-core/systemd/systemd_%.bbappend index 96ca6c69d..ef877c0c1 100644 --- a/meta-agl/recipes-core/systemd/systemd_%.bbappend +++ b/meta-agl/recipes-core/systemd/systemd_%.bbappend @@ -1,17 +1,22 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://e2fsck.conf \ - file://wired.network \ + ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','file://wired.network','',d)} \ " # enable networkd/resolved support -PACKAGECONFIG_append_pn-systemd = " networkd resolved" +PACKAGECONFIG_append_pn-systemd = " \ + ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','networkd resolved','',d)} \ +" do_install_append() { # Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time install -m 644 -p -D ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf - # Install DHCP configuration for Ethernet adapters - install -m 644 ${WORKDIR}/wired.network ${D}${sysconfdir}/systemd/network + + if ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','true','false',d)}; then + # Install DHCP configuration for Ethernet adapters + install -m 644 ${WORKDIR}/wired.network ${D}${sysconfdir}/systemd/network + fi } FILES_${PN} += "${sysconfdir}/e2fsck.conf " -- cgit 1.2.3-korg