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>
This commit is contained in:
parent
79f4495244
commit
d74325e22e
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue