diff options
Diffstat (limited to 'recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb')
-rw-r--r-- | recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb index 0700ac6..b6076cd 100644 --- a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb +++ b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb | |||
@@ -8,21 +8,37 @@ inherit allarch systemd | |||
8 | 8 | ||
9 | RPROVIDES_${PN} = "virtual/network-configuration" | 9 | RPROVIDES_${PN} = "virtual/network-configuration" |
10 | 10 | ||
11 | SRC_URI_append = " file://20-wired-dhcp.network" | 11 | SRC_URI = " \ |
12 | file://20-wired-dhcp.network \ | ||
13 | file://resolvconf-clean \ | ||
14 | file://clean-connman-symlink.service \ | ||
15 | " | ||
12 | PR = "r1" | 16 | PR = "r1" |
13 | 17 | ||
14 | RDEPENDS_${PN} = "systemd" | 18 | RDEPENDS_${PN} = "systemd" |
19 | RCONFLICTS_${PN} = "connman" | ||
15 | 20 | ||
16 | S = "${WORKDIR}" | 21 | S = "${WORKDIR}" |
17 | 22 | ||
18 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 23 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
19 | 24 | ||
20 | FILES_${PN} = "${systemd_unitdir}/network/*" | 25 | FILES_${PN} = " \ |
26 | ${systemd_unitdir}/network/* \ | ||
27 | ${sbindir}/resolvconf-clean \ | ||
28 | ${systemd_unitdir}/system/clean-connman-symlink.service \ | ||
29 | " | ||
30 | |||
31 | SYSTEMD_SERVICE_${PN} = "clean-connman-symlink.service" | ||
21 | 32 | ||
22 | DEV_MATCH_DIRECTIVE ?= "Name=en*" | 33 | DEV_MATCH_DIRECTIVE ?= "Name=en*" |
23 | 34 | ||
24 | do_install() { | 35 | do_install() { |
25 | install -d ${D}/${systemd_unitdir}/network | 36 | install -d ${D}/${systemd_unitdir}/network |
26 | install -m 0644 ${WORKDIR}/20-wired-dhcp.network ${D}/${systemd_unitdir}/network | 37 | 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 | 38 | sed -i -e 's|@MATCH_DIRECTIVE@|${DEV_MATCH_DIRECTIVE}|g' ${D}${systemd_unitdir}/network/20-wired-dhcp.network |
39 | |||
40 | install -d ${D}${sbindir} | ||
41 | install -m 0755 ${WORKDIR}/resolvconf-clean ${D}${sbindir}/resolvconf-clean | ||
42 | install -d ${D}${systemd_unitdir}/system | ||
43 | install -m 0644 ${WORKDIR}/clean-connman-symlink.service ${D}${systemd_unitdir}/system/clean-connman-symlink.service | ||
28 | } | 44 | } |