diff options
-rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb index b9273ac89..801739170 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb | |||
@@ -107,6 +107,8 @@ PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" | |||
107 | PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=${base_sbindir}/dhcpcd,-Ddhcpcd=no,,dhcpcd" | 107 | PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=${base_sbindir}/dhcpcd,-Ddhcpcd=no,,dhcpcd" |
108 | PACKAGECONFIG[dhclient] = "-Ddhclient=yes,-Ddhclient=no,,dhcp" | 108 | PACKAGECONFIG[dhclient] = "-Ddhclient=yes,-Ddhclient=no,,dhcp" |
109 | PACKAGECONFIG[concheck] = "-Dconcheck=true,-Dconcheck=false" | 109 | PACKAGECONFIG[concheck] = "-Dconcheck=true,-Dconcheck=false" |
110 | # The following PACKAGECONFIG is used to determine whether NM is managing /etc/resolv.conf itself or not | ||
111 | PACKAGECONFIG[man-resolv-conf] = ",," | ||
110 | 112 | ||
111 | 113 | ||
112 | PACKAGES =+ " \ | 114 | PACKAGES =+ " \ |
@@ -258,9 +260,9 @@ SYSTEMD_SERVICE:${PN}-daemon = "\ | |||
258 | " | 260 | " |
259 | RCONFLICTS:${PN}-daemon += "connman" | 261 | RCONFLICTS:${PN}-daemon += "connman" |
260 | ALTERNATIVE_PRIORITY = "100" | 262 | ALTERNATIVE_PRIORITY = "100" |
261 | ALTERNATIVE:${PN}-daemon = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" | 263 | ALTERNATIVE:${PN}-daemon = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','resolv-conf','',d)}" |
262 | ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" | 264 | ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','${sysconfdir}/resolv-conf.NetworkManager','',d)}" |
263 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" | 265 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','${sysconfdir}/resolv.conf','',d)}" |
264 | 266 | ||
265 | 267 | ||
266 | # The networkmanager package is an empty meta package which weakly depends on all the compiled features. | 268 | # The networkmanager package is an empty meta package which weakly depends on all the compiled features. |
@@ -285,7 +287,7 @@ do_install:append() { | |||
285 | 287 | ||
286 | rm -rf ${D}/run ${D}${localstatedir}/run | 288 | rm -rf ${D}/run ${D}${localstatedir}/run |
287 | 289 | ||
288 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 290 | if ${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','true','false',d)}; then |
289 | # For read-only filesystem, do not create links during bootup | 291 | # For read-only filesystem, do not create links during bootup |
290 | ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager | 292 | ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager |
291 | 293 | ||