summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-10-27 15:16:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-29 07:31:16 +0000
commit63a0311497a0f9d3a748da254b631d3c7edc1364 (patch)
tree815bde1550059c214c4fcacd0922a2c576b860ce /meta
parent1c3c76d78fd6261ef1919e87e5b19b0410ee976a (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-connectivity/connman/connman-conf.bb6
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
-rw-r--r--meta/recipes-connectivity/connman/connman/connman4
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}"
13 13
14PACKAGE_ARCH = "${MACHINE_ARCH}" 14PACKAGE_ARCH = "${MACHINE_ARCH}"
15 15
16FILES_${PN} = "${localstatedir}/* ${libdir}/*" 16FILES_${PN} = "${localstatedir}/* ${datadir}/*"
17 17
18do_install() { 18do_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}
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
69SYSTEMD_SERVICE_${PN} = "connman.service" 69SYSTEMD_SERVICE_${PN} = "connman.service"
70SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" 70SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
71SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" 71SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup"
72 72
73do_compile_append() { 73do_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}
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() {
49 fi 49 fi
50 fi 50 fi
51 fi 51 fi
52 if [ -f @LIBDIR@/connman/wired-setup ] ; then 52 if [ -f @DATADIR@/connman/wired-setup ] ; then
53 . @LIBDIR@/connman/wired-setup 53 . @DATADIR@/connman/wired-setup
54 fi 54 fi
55 $DAEMON $EXTRA_PARAM 55 $DAEMON $EXTRA_PARAM
56} 56}