From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1UVAu3-0007ge-KD for openembedded-core@lists.openembedded.org; Thu, 25 Apr 2013 03:23:17 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 24 Apr 2013 18:05:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,546,1363158000"; d="scan'208";a="291557434" Received: from linux.jf.intel.com (HELO linux.intel.com) ([10.23.219.25]) by azsmga001.ch.intel.com with ESMTP; 24 Apr 2013 18:05:30 -0700 Received: from firebird.rb.intel.com (firebird.rb.intel.com [10.237.105.149]) by linux.intel.com (Postfix) with ESMTP id B74C32C8001; Wed, 24 Apr 2013 18:05:21 -0700 (PDT) From: Stefan Stanacar To: openembedded-core@lists.openembedded.org Date: Thu, 25 Apr 2013 04:05:04 +0300 Message-Id: <1366851904-1306-1-git-send-email-stefanx.stanacar@intel.com> X-Mailer: git-send-email 1.8.1.4 Subject: [PATCH] connman: replace hardcoded path in init script X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 01:23:30 -0000 Because the connman init script sources a config file from /usr/lib we end up with no network in multilib enabled sato images, so replace with the real libdir. Signed-off-by: Stefan Stanacar --- meta/recipes-connectivity/connman/connman.inc | 3 ++- meta/recipes-connectivity/connman/connman/connman | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 589ece8..93c9da0 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 @@ -73,6 +73,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 a111f60..67ba7c8 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 } -- 1.8.1.4