diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-10-27 15:16:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-29 07:31:16 +0000 |
commit | 63a0311497a0f9d3a748da254b631d3c7edc1364 (patch) | |
tree | 815bde1550059c214c4fcacd0922a2c576b860ce /meta/recipes-connectivity/connman/connman.inc | |
parent | 1c3c76d78fd6261ef1919e87e5b19b0410ee976a (diff) | |
download | poky-63a0311497a0f9d3a748da254b631d3c7edc1364.tar.gz |
connman: Move wired-setup to ${datadir}
wired-setup script should not be in ${libdir} as it's not arch
dependent.
This also fixes (or works around) a practical issue where a multilib
build installs the wrong version of connman-conf and then connman
can't find the script.
[YOCTO #8550]
(From OE-Core rev: 38a6ecf0070a60eb14b353b158b70ddc919ad328)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman.inc')
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index ab7f86d12a..afdb3f2d09 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -68,7 +68,7 @@ python __anonymous () { | |||
68 | 68 | ||
69 | SYSTEMD_SERVICE_${PN} = "connman.service" | 69 | SYSTEMD_SERVICE_${PN} = "connman.service" |
70 | SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" | 70 | SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" |
71 | SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" | 71 | SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup" |
72 | 72 | ||
73 | do_compile_append() { | 73 | do_compile_append() { |
74 | sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service | 74 | sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service |
@@ -78,7 +78,7 @@ do_install_append() { | |||
78 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 78 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
79 | install -d ${D}${sysconfdir}/init.d | 79 | install -d ${D}${sysconfdir}/init.d |
80 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman | 80 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman |
81 | sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman | 81 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman |
82 | fi | 82 | fi |
83 | 83 | ||
84 | install -d ${D}${bindir} | 84 | install -d ${D}${bindir} |