summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/sota_raspberrypi.bbclass2
-rw-r--r--recipes-connectivity/networkd-dhcp-conf/files/20-wired-dhcp.network2
-rw-r--r--recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb3
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"
12# Deploy config fragment list to OSTree root fs 12# Deploy config fragment list to OSTree root fs
13IMAGE_INSTALL_append = " fit-conf" 13IMAGE_INSTALL_append = " fit-conf"
14 14
15PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" 15DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx"
16IMAGE_INSTALL_append_sota = " virtual/network-configuration " 16IMAGE_INSTALL_append_sota = " virtual/network-configuration "
17 17
18PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" 18PREFERRED_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]
2Name=en* 2@MATCH_DIRECTIVE@
3 3
4[Network] 4[Network]
5DHCP=yes 5DHCP=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
20FILES_${PN} = "${systemd_unitdir}/network/*" 20FILES_${PN} = "${systemd_unitdir}/network/*"
21 21
22DEV_MATCH_DIRECTIVE ?= "Name=en*"
23
22do_install() { 24do_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}