[oe] [meta-networking][PATCH] dnsmasq: don't expect systemd support to be set

[Martin Jansa]

On Sun, Aug 11, 2013 at 09:41:32PM +0100, Paul Eggleton wrote:
> Hi Mark,
> 
> On Saturday 10 August 2013 22:10:25 Mark Asselstine wrote:
> > If you don't have 'systemd' set in your DISTRO_FEATURES 'dnsmasq' will
> > fail to package due to a QA error;
> > 
> > ERROR: QA Issue: dnsmasq: Files/directories were installed but not shipped
> >   /lib
> > 
> > Check for systemd in DISTRO_FEATURES before performing installation
> > instructions related to systemd.
> > 
> > Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
> > ---
> >  meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> > b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index
> > 0f5b273..b9e7ff6 100644
> > --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> > +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> > @@ -31,8 +31,10 @@ do_install () {
> >      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
> 
> There's already a global fix for this in OE-Core:
> 
> http://cgit.openembedded.org/openembedded-core/commit/meta/classes/systemd.bbclass?id=ac5d20f4adac69ea1702694fb50849c9e465b443

I wanted to reply the same, but it doesn't fix empty /lib after
/lib/systemd is removed.

We should add this:
rmdir --ignore-fail-on-non-empty ${D}/lib

into that global fix to cover also this case.

(I'm intentionally not using base_libdir, because systemd_unitdir is
also defined as bitbake.conf:export systemd_unitdir = "/lib/systemd")

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130812/917e9d18/attachment-0002.sig>