summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2015-04-08 14:36:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-10 18:10:24 +0100
commitbf8aa743d972f42df95259e7fd0d81577b78096c (patch)
tree0a6be5641a660658604c42b08fc7747afd598fde /meta
parent21303a4ddb894e82be7529002345a770d9701502 (diff)
downloadpoky-bf8aa743d972f42df95259e7fd0d81577b78096c.tar.gz
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 rev: 32839103727d92a6580f916b6dd8e4439b2347c8) Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index e281e39b80..d068ba894a 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"
71 71
72inherit autotools pkgconfig systemd update-rc.d 72inherit autotools pkgconfig systemd update-rc.d
73 73
74do_configure_append () {
75 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service
76}
77
78# This allows *everyone* to access ConnMan over DBus, without any access 74# This allows *everyone* to access ConnMan over DBus, without any access
79# control. Really the at_console flag should work, which would mean that 75# control. Really the at_console flag should work, which would mean that
80# both this and the xuser patch can be dropped. 76# both this and the xuser patch can be dropped.
81do_compile_append() { 77do_compile_append() {
82 sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf 78 sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf
83 sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf 79 sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf
80
81 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service
84} 82}
85 83
86do_install_append() { 84do_install_append() {