diff options
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman/connman | 4 |
2 files changed, 5 insertions, 3 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 | ||
57 | SYSTEMD_SERVICE_${PN} = "connman.service" | 57 | SYSTEMD_SERVICE_${PN} = "connman.service" |
58 | SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" | 58 | SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" |
59 | SYSTEMD_WIRED_SETUP = "ExecStartPre=-/usr/lib/connman/wired-setup" | 59 | SYSTEMD_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 | ||
70 | do_configure_append () { | 70 | do_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} |
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 | } |