From e3a5e8e652a076a806dcb913764ad91f81a9fba4 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Tue, 14 May 2013 19:21:35 +0300 Subject: connman: replace hardcoded path in init script and systemd service The connman init script sources a setup file from /usr/lib/connman, so we end up with no network in qemu multilib enabled images. The init script it's installed by connman and because wired-setup it's installed by another package (connman-conf) we can't use libexecdir here and now (in the init script and systemd service file). Once libexecdir changes from ${libdir}/${bpn} to something else like /usr/libexec we could use that instead of ${libdir}/connman. Changed in v2: - better commit message [YOCTO #4493] (From OE-Core rev: fca3a884e9cae13a521d840838eee3c01f0b6acf) Signed-off-by: Stefan Stanacar Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman/connman | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-connectivity/connman/connman/connman') diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman index a111f609dc..67ba7c8a2a 100644 --- a/meta/recipes-connectivity/connman/connman/connman +++ b/meta/recipes-connectivity/connman/connman/connman @@ -32,8 +32,8 @@ do_start() { ethn=`ifconfig | grep eth | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"` EXTRA_PARAM="-I $ethn" fi - if [ -f /usr/lib/connman/wired-setup ] ; then - . /usr/lib/connman/wired-setup + if [ -f @LIBDIR@/connman/wired-setup ] ; then + . @LIBDIR@/connman/wired-setup fi $DAEMON $EXTRA_PARAM } -- cgit v1.2.3-54-g00ecf