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

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

[Mark Asselstine]

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@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
-- 
1.8.1.2

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

[Paul Eggleton]

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@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

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

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

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2294 bytes --]

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@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@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

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

[Mark Asselstine]

On August 12, 2013 08:59:05 Martin Jansa wrote:
> 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@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.

Correct, /lib hanging around is not corrected by the fix Paul mentions. I am 
fine with the more global solution trumping my fix and Joe has already 
indicated that he will wait for this to resolve this issue. Thanks for having 
a look and getting this fixed for everyone.

Mark 

> 
> 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@gmail.com

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

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1952 bytes --]

Hey Mark,

[[meta-networking][PATCH] dnsmasq: don't expect systemd support to be set] On 13.08.10 (Sat 22:10) 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@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

My first reaction to this was we just had it fixed in oe-core quite
recently, but Martin identified a condition that's not covered (yet) in
the oe-core fix.  That said, I'm going to wait for the oe-core fix,
since right now I'd rather weed out any systemd on/off handling in
meta-networking.

-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]