From 20c897d34ba4ea3985723383a0effa3631cd925e Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 27 Jan 2016 11:24:00 +0000 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-connectivity/connman/connman.inc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'meta/recipes-connectivity/connman') 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 -- cgit 1.2.3-korg