[oe] [meta-networking][PATCH] dnsmasq: install .service only with systemd in DISTRO_FEATURES

[Paul Eggleton]

On Thursday 04 July 2013 07:18:09 Joe MacDonald wrote:
> [Re: [oe] [meta-networking][PATCH] dnsmasq: install .service only with 
systemd in DISTRO_FEATURES] On 13.07.04 (Thu 11:50) Paul Eggleton wrote:
> > On Thursday 04 July 2013 17:26:23 Chunrong Guo wrote:
> > > Signed-off-by: Chunrong Guo <B40290 at freescale.com>
> > > ---
> > > 
> > >  .../recipes-support/dnsmasq/dnsmasq.inc            |    8 +++++---
> > >  1 files changed, 5 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> > > b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index
> > > 0f5b273..0710893 100644
> > > --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> > > +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> > > @@ -30,9 +30,11 @@ do_install () {
> > > 
> > >      install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d
> > > 
> > > ${D}${sysconfdir}/dnsmasq.d install -m 644 ${WORKDIR}/dnsmasq.conf
> > > ${D}${sysconfdir}/
> > > 
> > >      install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
> > > 
> > > -
> > > -    install -d ${D}${systemd_unitdir}/system
> > > -    install -m 0644 ${WORKDIR}/dnsmasq.service
> > > ${D}${systemd_unitdir}/system +
> > > +    if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)};
> > > then +        install -d ${D}${systemd_unitdir}/system
> > > +        install -m 0644 ${WORKDIR}/dnsmasq.service
> > > ${D}${systemd_unitdir}/system +    fi
> > > 
> > >      if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" !=
> > >      ""
> > > 
> > > ]; then install -d ${D}${sysconfdir}/dbus-1/system.d
> > 
> > I think we should really have a global fix for this issue rather than
> > hacking up every recipe:
> > 
> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=4309
> 
> I'm inclined to agree, but looking at the bug it looks like the
> potential solution was discussed in February and it's on the schedule
> for Yocto 1.5, but that's October.

The thing is it could be done by anyone at any time - the bug is at status 
"NEW" which means the assignee hasn't actually accepted it yet, and the 
solution being suggested is fairly straightforward. Given that I think it 
would be easier to just fix the class and then we never have to worry about 
this issue again.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre