diff options
Diffstat (limited to 'meta-agl-core/recipes-core/systemd/systemd_aglcore.inc')
-rw-r--r-- | meta-agl-core/recipes-core/systemd/systemd_aglcore.inc | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc index feca107a8..9681329be 100644 --- a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc +++ b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc @@ -1,34 +1,36 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" +FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" SRC_URI += "\ - file://0002-network-add-CAN-Termination-tristate-option.patch \ file://e2fsck.conf \ - file://canbus-can.network \ - ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','file://wired.network','',d)} \ + file://wait-disable.conf \ + file://wired.network \ " -# enable networkd/resolved support -PACKAGECONFIG_append_pn-systemd = " \ +# Enable networkd/resolved support if using systemd for network management +PACKAGECONFIG:append = " \ ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','networkd resolved','',d)} \ + iptc \ " -do_install_append() { +# SPEC-737: connmand also has a NTP client which races with systemd-timesyncd +PACKAGECONFIG:remove = "timesyncd" + +# Enable systemd-coredump when agl-devel is set on +PACKAGECONFIG:append:agl-devel = " coredump" + +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 canbus network script - install -m 0644 ${WORKDIR}/canbus-can.network ${D}${nonarch_base_libdir}/systemd/network/60-canbus-can.network - - if ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','true','false',d)}; then + if [ "${VIRTUAL-RUNTIME_net_manager}" = "systemd" ]; then # Install DHCP configuration for Ethernet adapters install -m 644 ${WORKDIR}/wired.network ${D}${sysconfdir}/systemd/network + elif [ "${VIRTUAL-RUNTIME_net_manager}" = "connman" ]; then + # Disable systemd-networkd-wait-online by default + install -d ${D}${systemd_system_unitdir}/systemd-networkd-wait-online.service.d + install -m 0644 ${WORKDIR}/wait-disable.conf ${D}${systemd_system_unitdir}/systemd-networkd-wait-online.service.d/ fi } -FILES_${PN} += "${sysconfdir}/e2fsck.conf " - -# SPEC-737: connmand also has a NTP client which races with systemd-timesyncd -PACKAGECONFIG_remove = "timesyncd" +FILES:${PN} += "${sysconfdir}/e2fsck.conf " -# Enable systemd-coredump when agl-devel is set on -PACKAGECONFIG_append_agl-devel = " coredump" |