summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
-rw-r--r--meta/recipes-connectivity/connman/connman/connman4
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 589ece8583..1412ba41f2 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -47,7 +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" 50SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
51 51
52# 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
53# 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
@@ -60,6 +60,7 @@ inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd
60 60
61do_configure_append () { 61do_configure_append () {
62 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service 62 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service
63
63} 64}
64 65
65# This allows *everyone* to access ConnMan over DBus, without any access 66# This allows *everyone* to access ConnMan over DBus, without any access
@@ -73,6 +74,7 @@ do_install_append() {
73 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 74 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
74 install -d ${D}${sysconfdir}/init.d 75 install -d ${D}${sysconfdir}/init.d
75 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman 76 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
77 sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman
76 fi 78 fi
77 79
78 install -d ${D}${bindir} 80 install -d ${D}${bindir}
diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman
index a111f609dc..67ba7c8a2a 100644
--- a/meta/recipes-connectivity/connman/connman/connman
+++ b/meta/recipes-connectivity/connman/connman/connman
@@ -32,8 +32,8 @@ do_start() {
32 ethn=`ifconfig | grep eth | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"` 32 ethn=`ifconfig | grep eth | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
33 EXTRA_PARAM="-I $ethn" 33 EXTRA_PARAM="-I $ethn"
34 fi 34 fi
35 if [ -f /usr/lib/connman/wired-setup ] ; then 35 if [ -f @LIBDIR@/connman/wired-setup ] ; then
36 . /usr/lib/connman/wired-setup 36 . @LIBDIR@/connman/wired-setup
37 fi 37 fi
38 $DAEMON $EXTRA_PARAM 38 $DAEMON $EXTRA_PARAM
39} 39}