[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6529/8267] connman: fix build-time warning with sysvinit

[Emmanuele Bassi <ebassi src gnome org>]

commit f6eb3edee3ed5b9fb7123325a50bebeba0212f16
Author: Maxin B. John <maxin john intel com>
Date:   Tue Jun 20 11:35:40 2017 +0300

    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>

 meta/recipes-connectivity/connman/connman.inc |    6 +++---
 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"
 SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service"
 
 ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} ="resolv-conf"
-ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.connman"
-ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf"
+ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}"
+ALTERNATIVE_TARGET[resolv-conf] = 
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.connman','',d)}"
+ALTERNATIVE_LINK_NAME[resolv-conf] = 
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}"
 
 do_install_append() {
        if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then