From 8e33202195c3e0c133ba705d6c77e669fcf3bfad Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Wed, 6 Mar 2019 12:43:33 +0100 Subject: Replace connman with systemd-networkd on raspberrypi Signed-off-by: Laurent Bonnans --- classes/sota_raspberrypi.bbclass | 2 +- recipes-connectivity/networkd-dhcp-conf/files/20-wired-dhcp.network | 2 +- recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index 1b54558..3add247 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass @@ -12,7 +12,7 @@ UBOOT_DTBO_LOADADDRESS = "0x06000000" # Deploy config fragment list to OSTree root fs IMAGE_INSTALL_append = " fit-conf" -PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" +DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx" IMAGE_INSTALL_append_sota = " virtual/network-configuration " PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" diff --git a/recipes-connectivity/networkd-dhcp-conf/files/20-wired-dhcp.network b/recipes-connectivity/networkd-dhcp-conf/files/20-wired-dhcp.network index aec1849..edb3678 100644 --- a/recipes-connectivity/networkd-dhcp-conf/files/20-wired-dhcp.network +++ b/recipes-connectivity/networkd-dhcp-conf/files/20-wired-dhcp.network @@ -1,5 +1,5 @@ [Match] -Name=en* +@MATCH_DIRECTIVE@ [Network] DHCP=yes diff --git a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb index 39500c7..1a515a2 100644 --- a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb +++ b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb @@ -19,7 +19,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" FILES_${PN} = "${systemd_unitdir}/network/*" +DEV_MATCH_DIRECTIVE ?= "Name=en*" + do_install() { install -d ${D}/${systemd_unitdir}/network install -m 0644 ${WORKDIR}/20-wired-dhcp.network ${D}/${systemd_unitdir}/network + sed -i -e 's|@MATCH_DIRECTIVE@|${DEV_MATCH_DIRECTIVE}|g' ${D}${systemd_unitdir}/network/20-wired-dhcp.network } -- cgit v1.2.3-54-g00ecf