diff options
| author | Maxin B. John <maxin.john@intel.com> | 2017-06-20 11:35:40 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-28 15:51:59 +0100 |
| commit | 2a0afa9682d6119f403626ca31cd8c9854637312 (patch) | |
| tree | baa0d94ea3bc74f05bcbc643cd3e2f2115a5b504 | |
| parent | f38290ec2a727427a6481e4dafb02ecd8a60fad1 (diff) | |
| download | openembedded-core-2a0afa9682d6119f403626ca31cd8c9854637312.tar.gz openembedded-core-2a0afa9682d6119f403626ca31cd8c9854637312.tar.bz2 openembedded-core-2a0afa9682d6119f403626ca31cd8c9854637312.zip | |
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.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | 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 ab18f2fe01..7e05c8017d 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 |