diff options
| author | Joshua Lock <joshua.lock@collabora.co.uk> | 2016-01-27 11:24:00 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-29 18:14:53 +0000 |
| commit | 20c897d34ba4ea3985723383a0effa3631cd925e (patch) | |
| tree | e7c422112959daaf75a7789cf8d74b287a45b6f5 /meta | |
| parent | 530c4525f278bff72d8184035d00020c10b8f8b4 (diff) | |
| download | openembedded-core-20c897d34ba4ea3985723383a0effa3631cd925e.tar.gz openembedded-core-20c897d34ba4ea3985723383a0effa3631cd925e.tar.bz2 openembedded-core-20c897d34ba4ea3985723383a0effa3631cd925e.zip | |
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]
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 5 |
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 () { SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service" -SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup" - -do_compile_append() { - sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service -} do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |