From 8721671e83fbf6f1d69ed06781b2b8e206780d35 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 master rev: fca3a884e9cae13a521d840838eee3c01f0b6acf) (From OE-Core rev: d620e5376c10bc5ff1aa551be4a7d1d635a760c3) Signed-off-by: Stefan Stanacar Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman.inc | 4 +++- meta/recipes-connectivity/connman/connman/connman | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 589ece8583..1412ba41f2 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -47,7 +47,7 @@ INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." SYSTEMD_SERVICE_${PN} = "connman.service" -SYSTEMD_WIRED_SETUP = "ExecStartPre=-/usr/lib/connman/wired-setup" +SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" # IMPORTANT: because xuser is shared with rootless X, please make sure the # USERADD_PARAM is in sync with the one in xserver-nodm-init.bb @@ -60,6 +60,7 @@ inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd do_configure_append () { sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service + } # This allows *everyone* to access ConnMan over DBus, without any access @@ -73,6 +74,7 @@ do_install_append() { if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman + sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman fi install -d ${D}${bindir} 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