diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-03-06 12:43:33 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2019-04-26 16:00:51 +0200 |
commit | 578a50086b99f8dfd3093094d216e58e60d7d1f1 (patch) | |
tree | e3c19ca999dd44d31286401de7e0c6dadcd9b463 | |
parent | 65e82c7b0cbcaf543c380082fcc2d172b7d0fb34 (diff) | |
download | meta-updater-578a50086b99f8dfd3093094d216e58e60d7d1f1.tar.gz |
Replace connman with systemd-networkd on raspberrypi
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
-rw-r--r-- | classes/sota_raspberrypi.bbclass | 2 | ||||
-rw-r--r-- | recipes-connectivity/networkd-dhcp-conf/files/20-wired-dhcp.network | 2 | ||||
-rw-r--r-- | 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 78b8cab..5cbf4c0 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass | |||
@@ -3,7 +3,7 @@ RPI_USE_U_BOOT_sota = "1" | |||
3 | KERNEL_CLASSES_append_sota = " kernel-fitimage" | 3 | KERNEL_CLASSES_append_sota = " kernel-fitimage" |
4 | KERNEL_IMAGETYPE_sota = "fitImage" | 4 | KERNEL_IMAGETYPE_sota = "fitImage" |
5 | 5 | ||
6 | PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" | 6 | DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx" |
7 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | 7 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " |
8 | 8 | ||
9 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" | 9 | 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 @@ | |||
1 | [Match] | 1 | [Match] |
2 | Name=en* | 2 | @MATCH_DIRECTIVE@ |
3 | 3 | ||
4 | [Network] | 4 | [Network] |
5 | DHCP=yes | 5 | 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}" | |||
19 | 19 | ||
20 | FILES_${PN} = "${systemd_unitdir}/network/*" | 20 | FILES_${PN} = "${systemd_unitdir}/network/*" |
21 | 21 | ||
22 | DEV_MATCH_DIRECTIVE ?= "Name=en*" | ||
23 | |||
22 | do_install() { | 24 | do_install() { |
23 | install -d ${D}/${systemd_unitdir}/network | 25 | install -d ${D}/${systemd_unitdir}/network |
24 | install -m 0644 ${WORKDIR}/20-wired-dhcp.network ${D}/${systemd_unitdir}/network | 26 | install -m 0644 ${WORKDIR}/20-wired-dhcp.network ${D}/${systemd_unitdir}/network |
27 | sed -i -e 's|@MATCH_DIRECTIVE@|${DEV_MATCH_DIRECTIVE}|g' ${D}${systemd_unitdir}/network/20-wired-dhcp.network | ||
25 | } | 28 | } |