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:26:25 +0000 |
| commit | 38a6ecf0070a60eb14b353b158b70ddc919ad328 (patch) | |
| tree | eb904538f8810da47225158119b8fe494a0f648c /meta/recipes-connectivity/connman | |
| parent | 7754e0f71eb794f0e06a1b005e3824fac4cdac6c (diff) | |
| download | openembedded-core-38a6ecf0070a60eb14b353b158b70ddc919ad328.tar.gz openembedded-core-38a6ecf0070a60eb14b353b158b70ddc919ad328.tar.bz2 openembedded-core-38a6ecf0070a60eb14b353b158b70ddc919ad328.zip | |
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]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/connman')
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-conf.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman/connman | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb index bd4c28d997..9254ed7031 100644 --- a/meta/recipes-connectivity/connman/connman-conf.bb +++ b/meta/recipes-connectivity/connman/connman-conf.bb @@ -13,14 +13,14 @@ S = "${WORKDIR}" PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "${localstatedir}/* ${libdir}/*" +FILES_${PN} = "${localstatedir}/* ${datadir}/*" do_install() { #Configure Wired network interface in case of qemu* machines if test -e ${WORKDIR}/wired.config && test -e ${WORKDIR}/wired-setup; then install -d ${D}${localstatedir}/lib/connman install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman - install -d ${D}${libdir}/connman - install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman + install -d ${D}${datadir}/connman + install -m 0755 ${WORKDIR}/wired-setup ${D}${datadir}/connman fi } 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 () { SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" -SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" +SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup" do_compile_append() { sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service @@ -78,7 +78,7 @@ do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman - sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman + sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman fi install -d ${D}${bindir} diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman index bf7a94a06d..c64fa0d715 100644 --- a/meta/recipes-connectivity/connman/connman/connman +++ b/meta/recipes-connectivity/connman/connman/connman @@ -49,8 +49,8 @@ do_start() { fi fi fi - if [ -f @LIBDIR@/connman/wired-setup ] ; then - . @LIBDIR@/connman/wired-setup + if [ -f @DATADIR@/connman/wired-setup ] ; then + . @DATADIR@/connman/wired-setup fi $DAEMON $EXTRA_PARAM } |