From 2bb285d6b8747fb0daf1bee6d5aaad95d8b45a7c Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Wed, 8 Apr 2015 14:36:19 +0300 Subject: connman: Create connman.service at proper moment ConnMan commit ac332c5d01b0737c18cb58c8ccc67cf6b0427e1d changes how the connman.service file is created from .in file. After that commit, the file is created by Makefile instead of configure. This means that we need to tweak the service file in compile time instead of configure time because the generated file will not be there after the configuration. This commit can be used even with older ConnMan version as the connman.service file is there when the compilation happens. (From OE-Core master rev: 32839103727d92a6580f916b6dd8e4439b2347c8) (From OE-Core rev: 66d8cec7225cae7269c539d9372a1364c9cefc0d) Signed-off-by: Jukka Rissanen Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index e281e39..d068ba8 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -71,16 +71,14 @@ SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" inherit autotools pkgconfig systemd update-rc.d -do_configure_append () { - sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service -} - # This allows *everyone* to access ConnMan over DBus, without any access # control. Really the at_console flag should work, which would mean that # both this and the xuser patch can be dropped. do_compile_append() { sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf + + sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service } do_install_append() { -- cgit v1.1