summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2015-04-08 14:36:19 +0300
committerAndreas Oberritter <obi@opendreambox.org>2015-04-22 10:03:54 +0200
commit373d401eb67552517a3658b3d35a17e542d43f31 (patch)
treef91d66997b7ffbfed88f7bb8b2d778ba3c68cc68
parentfb7d2eb0e9ad4ad518296aee191aeda7c1d760f3 (diff)
downloadopenembedded-core-contrib-373d401eb67552517a3658b3d35a17e542d43f31.tar.gz
openembedded-core-contrib-373d401eb67552517a3658b3d35a17e542d43f31.tar.bz2
openembedded-core-contrib-373d401eb67552517a3658b3d35a17e542d43f31.zip
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. Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 32839103727d92a6580f916b6dd8e4439b2347c8) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-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 7f03872cdc..06f7dd2445 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -61,16 +61,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() {