summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2013-03-22 10:11:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 16:54:37 +0000
commite93b6376a0cff5321dd7fc13a88c8b06ae8b83c7 (patch)
tree996ae55651ef0f7096672cd292d71d5ff0a5483f /meta/recipes-connectivity
parentfdd76ead8573a6c0ca39602b8e894291edc171aa (diff)
downloadpoky-e93b6376a0cff5321dd7fc13a88c8b06ae8b83c7.tar.gz
connman-conf: Move the setup script into /usr/lib/connman
The /etc/connman is not suitable for the setup script. There are other connman related scripts in /usr/lib/connman so moving the wired setup script there. (From OE-Core rev: 858ad53aee9ef5848c09d76c0e6bf464bc31d30e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman-conf.bb8
-rw-r--r--meta/recipes-connectivity/connman/connman/connman4
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb
index 7b999533f1..6ecfbfbe86 100644
--- a/meta/recipes-connectivity/connman/connman-conf.bb
+++ b/meta/recipes-connectivity/connman/connman-conf.bb
@@ -6,16 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
6SRC_URI_append_qemuall = "file://wired.config \ 6SRC_URI_append_qemuall = "file://wired.config \
7 file://wired-setup \ 7 file://wired-setup \
8 " 8 "
9PR = "r1" 9PR = "r2"
10 10
11PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
12 12
13FILES_${PN} = "${localstatedir}/* ${libdir}/*"
14
13do_install() { 15do_install() {
14 #Configure Wired network interface in case of qemu* machines 16 #Configure Wired network interface in case of qemu* machines
15 if test -e ${WORKDIR}/wired.config && test -e ${WORKDIR}/wired-setup; then 17 if test -e ${WORKDIR}/wired.config && test -e ${WORKDIR}/wired-setup; then
16 install -d ${D}${localstatedir}/lib/connman 18 install -d ${D}${localstatedir}/lib/connman
17 install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman 19 install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman
18 install -d ${D}${sysconfdir}/connman 20 install -d ${D}${libdir}/connman
19 install -m 0755 ${WORKDIR}/wired-setup ${D}${sysconfdir}/connman 21 install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman
20 fi 22 fi
21} 23}
diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman
index ffd7fac547..a111f609dc 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 /etc/connman/wired-setup ] ; then 35 if [ -f /usr/lib/connman/wired-setup ] ; then
36 . /etc/connman/wired-setup 36 . /usr/lib/connman/wired-setup
37 fi 37 fi
38 $DAEMON $EXTRA_PARAM 38 $DAEMON $EXTRA_PARAM
39} 39}