summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-05-14 19:21:35 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-16 00:09:49 +0300
commite3a5e8e652a076a806dcb913764ad91f81a9fba4 (patch)
tree45866cf75ef83e1dc99e6c110798119cf44545ba /meta
parentec89446cb41c2be6aa76904f972d21611df90a5f (diff)
downloadpoky-e3a5e8e652a076a806dcb913764ad91f81a9fba4.tar.gz
connman: replace hardcoded path in init script and systemd service
The connman init script sources a setup file from /usr/lib/connman, so we end up with no network in qemu multilib enabled images. The init script it's installed by connman and because wired-setup it's installed by another package (connman-conf) we can't use libexecdir here and now (in the init script and systemd service file). Once libexecdir changes from ${libdir}/${bpn} to something else like /usr/libexec we could use that instead of ${libdir}/connman. Changed in v2: - better commit message [YOCTO #4493] (From OE-Core rev: fca3a884e9cae13a521d840838eee3c01f0b6acf) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 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}
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}