summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-04-01 18:54:37 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-02 18:08:23 +0100
commit510d8b51dfd473314f1528a36bbc5c79c22a103f (patch)
tree38e364c47cbc74e16bfdc791bbf17003a9f07c9a /meta/recipes-connectivity/connman
parentb50626c6f03d40055521e32f8e0b6968961cdc8e (diff)
downloadpoky-510d8b51dfd473314f1528a36bbc5c79c22a103f.tar.gz
connman: added wired setup for systemd
Added support for correctly configuring wired interface if systemd is the init system. Fixes [YOCTO #4041]. (From OE-Core rev: ec5530779df23ea25729c7d19c664c05fae5758d) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 96ebc551b8..5d35bc2185 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r0" 23INC_PR = "r1"
24 24
25TIST = "--enable-tist" 25TIST = "--enable-tist"
26TIST_powerpc = "" 26TIST_powerpc = ""
@@ -47,6 +47,7 @@ INITSCRIPT_NAME = "connman"
47INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 47INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
48 48
49SYSTEMD_SERVICE_${PN} = "connman.service" 49SYSTEMD_SERVICE_${PN} = "connman.service"
50SYSTEMD_WIRED_SETUP = "ExecStartPre=-/usr/lib/connman/wired-setup"
50 51
51# IMPORTANT: because xuser is shared with rootless X, please make sure the 52# IMPORTANT: because xuser is shared with rootless X, please make sure the
52# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb 53# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb
@@ -57,6 +58,10 @@ USERADD_PARAM_${PN} = "--create-home \
57 58
58inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd 59inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd
59 60
61do_configure_append () {
62 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service
63}
64
60# This allows *everyone* to access ConnMan over DBus, without any access 65# This allows *everyone* to access ConnMan over DBus, without any access
61# control. Really the at_console flag should work, which would mean that 66# control. Really the at_console flag should work, which would mean that
62# both this and the xuser patch can be dropped. 67# both this and the xuser patch can be dropped.