summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman/connman.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/connman/connman.inc')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 8d6f68ceb7..0eb58651c5 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -56,7 +56,7 @@ INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
56 56
57SYSTEMD_SERVICE_${PN} = "connman.service" 57SYSTEMD_SERVICE_${PN} = "connman.service"
58SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" 58SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
59SYSTEMD_WIRED_SETUP = "ExecStartPre=-/usr/lib/connman/wired-setup" 59SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
60 60
61# IMPORTANT: because xuser is shared with rootless X, please make sure the 61# IMPORTANT: because xuser is shared with rootless X, please make sure the
62# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb 62# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb
@@ -69,6 +69,7 @@ inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd
69 69
70do_configure_append () { 70do_configure_append () {
71 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service 71 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service
72
72} 73}
73 74
74# This allows *everyone* to access ConnMan over DBus, without any access 75# This allows *everyone* to access ConnMan over DBus, without any access
@@ -83,6 +84,7 @@ do_install_append() {
83 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 84 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
84 install -d ${D}${sysconfdir}/init.d 85 install -d ${D}${sysconfdir}/init.d
85 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman 86 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
87 sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman
86 fi 88 fi
87 89
88 install -d ${D}${bindir} 90 install -d ${D}${bindir}