sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Jukka Rissanen 2013-03-22 10:11:41 +02:00 committed by Richard Purdie
parent fdd76ead85
commit e93b6376a0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-connectivity/connman/connman-conf.bb
View File

@ -6,16 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
SRC_URI_append_qemuall = "file://wired.config \
file://wired-setup \
"
PR = "r1"
PR = "r2"
PACKAGE_ARCH = "${MACHINE_ARCH}"
FILES_${PN} = "${localstatedir}/* ${libdir}/*"
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}${sysconfdir}/connman
install -m 0755 ${WORKDIR}/wired-setup ${D}${sysconfdir}/connman
install -d ${D}${libdir}/connman
install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman
fi
}

4
meta/recipes-connectivity/connman/connman/connman
View File

@ -32,8 +32,8 @@ do_start() {
ethn=`ifconfig | grep eth | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
EXTRA_PARAM="-I $ethn"
fi
if [ -f /etc/connman/wired-setup ] ; then
. /etc/connman/wired-setup
if [ -f /usr/lib/connman/wired-setup ] ; then
. /usr/lib/connman/wired-setup
fi
$DAEMON $EXTRA_PARAM
}