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-conf.bb | |
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-conf.bb')
-rw-r--r-- | meta/recipes-connectivity/connman/connman-conf.bb | 6 |
1 files changed, 3 insertions, 3 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}" | |||
13 | 13 | ||
14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 14 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
15 | 15 | ||
16 | FILES_${PN} = "${localstatedir}/* ${libdir}/*" | 16 | FILES_${PN} = "${localstatedir}/* ${datadir}/*" |
17 | 17 | ||
18 | do_install() { | 18 | do_install() { |
19 | #Configure Wired network interface in case of qemu* machines | 19 | #Configure Wired network interface in case of qemu* machines |
20 | if test -e ${WORKDIR}/wired.config && test -e ${WORKDIR}/wired-setup; then | 20 | if test -e ${WORKDIR}/wired.config && test -e ${WORKDIR}/wired-setup; then |
21 | install -d ${D}${localstatedir}/lib/connman | 21 | install -d ${D}${localstatedir}/lib/connman |
22 | install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman | 22 | install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman |
23 | install -d ${D}${libdir}/connman | 23 | install -d ${D}${datadir}/connman |
24 | install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman | 24 | install -m 0755 ${WORKDIR}/wired-setup ${D}${datadir}/connman |
25 | fi | 25 | fi |
26 | } | 26 | } |