diff options
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 7 |
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 | ||
23 | INC_PR = "r0" | 23 | INC_PR = "r1" |
24 | 24 | ||
25 | TIST = "--enable-tist" | 25 | TIST = "--enable-tist" |
26 | TIST_powerpc = "" | 26 | TIST_powerpc = "" |
@@ -47,6 +47,7 @@ INITSCRIPT_NAME = "connman" | |||
47 | INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." | 47 | INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." |
48 | 48 | ||
49 | SYSTEMD_SERVICE_${PN} = "connman.service" | 49 | SYSTEMD_SERVICE_${PN} = "connman.service" |
50 | SYSTEMD_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 | ||
58 | inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd | 59 | inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd |
59 | 60 | ||
61 | do_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. |