summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2017-06-20 08:35:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 14:52:18 (GMT)
commitf6eb3edee3ed5b9fb7123325a50bebeba0212f16 (patch)
tree0658f414d9fc954e72559634077b6406c8ea09d5 /meta/recipes-connectivity/connman
parent3674b6e8bde8703f357913f2336e5fad4c8fc276 (diff)
downloadpoky-f6eb3edee3ed5b9fb7123325a50bebeba0212f16.tar.gz
connman: fix build-time warning with sysvinit
Due to recent modifications related to systemd, sysvinit builds began to show this warning: WARNING: connman-1.34-r0 do_package: connman: NOT adding alternative provide /etc/resolv.conf: /etc/resolv-conf.connman does not exist Fix this warning by making those updates specific to systemd. (From OE-Core rev: 2a0afa9682d6119f403626ca31cd8c9854637312) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ab18f2f..7e05c80 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -70,9 +70,9 @@ SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
70SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service" 70SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service"
71 71
72ALTERNATIVE_PRIORITY = "100" 72ALTERNATIVE_PRIORITY = "100"
73ALTERNATIVE_${PN} ="resolv-conf" 73ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}"
74ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.connman" 74ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.connman','',d)}"
75ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" 75ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}"
76 76
77do_install_append() { 77do_install_append() {
78 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 78 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then