summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2016-01-27 11:24:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-30 11:37:00 +0000
commitd74325e22ed81e49eec63335fd0f4b789f9dfc21 (patch)
tree3a57e5293e4be2951645a119f55dc4b3402bf595 /meta
parent79f4495244ceddb197879ae24c33f469285bbff2 (diff)
downloadpoky-d74325e22ed81e49eec63335fd0f4b789f9dfc21.tar.gz
connman: tidy up connman-conf usage
connman-conf is now a systemd oneshot and therefore doesn't need to be sed'ed in to the ConnMan service file. Note: this doesn't affect sysvinit where we provide a ConnMan init script which checks for the presence of the wired-networking script and, if it exists, executes it as part of the connman init. [YOCTO #8399] (From OE-Core rev: 20c897d34ba4ea3985723383a0effa3631cd925e) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc5
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 856ba44897..c3752514cc 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -69,11 +69,6 @@ python __anonymous () {
69SYSTEMD_SERVICE_${PN} = "connman.service" 69SYSTEMD_SERVICE_${PN} = "connman.service"
70SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" 70SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
71SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service" 71SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service"
72SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup"
73
74do_compile_append() {
75 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service
76}
77 72
78do_install_append() { 73do_install_append() {
79 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 74 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then