[OE-core] [PATCH] connman: replace hardcoded path in init script

[Stefan Stanacar]

Mark Hatle <mark.hatle at ...> writes:

> 
> On 4/24/13 8:05 PM, Stefan Stanacar wrote:
> > 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 <stefanx.stanacar at ...>
> > ---
> >   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
> >  <at>  <at>  -47,7 +47,7  <at>  <at>  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"
> 
> I don't think this is right.  The initscript and setup command should be 
in the 
> 'libexec' location, which is /usr/lib/connman.  This way the initscript 
from any 
> duplicate multilibs installed won't cause a conflict.  And the binaries 
end up 
> in a known location.  (The libraries on the other hand should definitely 
be in 
> the libdir.)
> 


Okay, that makes sense. The only problem is that wired-setup is installed by 
connman-conf so libexec won't work.  (connman rrecomends connman-conf which 
installs wired.config and wired-setup for qemu machines only). And I'm not 
sure how to get around that.

Poky commit  e93b6376a0cff5321dd7fc13a88c8b06ae8b83c7 moved wired-setup from 
/etc/connman to /usr/lib/connman. 
I do think that /etc/connman/wired-setup was the better location (or perhaps 
connman-conf), given that's only a script sourced in /etc/init.d/connman if 
it exists. But I don't know the reasons why it was moved to 
/usr/lib/connman.

Any thoughts?