Patchwork avahi: move systemd support where it belongs

login
register
mail settings
Submitter Martin Jansa
Date March 4, 2013, 1:25 p.m.
Message ID <1362403514-10122-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/45477/
State Accepted
Commit 02492d43cd7095acb3cf29843a50444c28b4d994
Headers show

Comments

Martin Jansa - March 4, 2013, 1:25 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
 meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)
Richard Purdie - March 5, 2013, 2:10 p.m.
On Mon, 2013-03-04 at 14:25 +0100, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
>  meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
>  2 files changed, 7 insertions(+), 5 deletions(-)

"where it belongs"? Is this due to the avahi-ui recipe?

Cheers,

Richard

> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index 3a4547c..51cbe38 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -37,11 +37,7 @@ USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \
>                                -c \"Avahi autoip daemon\" \
>                                avahi-autoipd"
>  
> -inherit autotools pkgconfig update-rc.d gettext systemd useradd
> -
> -SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
> -SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
> -SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
> +inherit autotools pkgconfig update-rc.d gettext useradd
>  
>  EXTRA_OECONF = "--disable-introspection \
>               --with-avahi-priv-access-group=adm \
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> index cff0974..22731f9 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> @@ -1,5 +1,11 @@
>  require avahi.inc
>  
> +inherit systemd
> +
> +SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
> +SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
> +SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
> +
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>                      file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
>                      file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
Martin Jansa - March 5, 2013, 2:20 p.m.
On Tue, Mar 05, 2013 at 02:10:25PM +0000, Richard Purdie wrote:
> On Mon, 2013-03-04 at 14:25 +0100, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
> >  meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
> >  2 files changed, 7 insertions(+), 5 deletions(-)
> 
> "where it belongs"? Is this due to the avahi-ui recipe?

Yes, avahi-ui is overwriting PACKAGES and systemd.bbclass was showing
warnings since this systemd was added to avahi.inc

> > diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> > index 3a4547c..51cbe38 100644
> > --- a/meta/recipes-connectivity/avahi/avahi.inc
> > +++ b/meta/recipes-connectivity/avahi/avahi.inc
> > @@ -37,11 +37,7 @@ USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \
> >                                -c \"Avahi autoip daemon\" \
> >                                avahi-autoipd"
> >  
> > -inherit autotools pkgconfig update-rc.d gettext systemd useradd
> > -
> > -SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
> > -SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
> > -SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
> > +inherit autotools pkgconfig update-rc.d gettext useradd
> >  
> >  EXTRA_OECONF = "--disable-introspection \
> >               --with-avahi-priv-access-group=adm \
> > diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> > index cff0974..22731f9 100644
> > --- a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> > +++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> > @@ -1,5 +1,11 @@
> >  require avahi.inc
> >  
> > +inherit systemd
> > +
> > +SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
> > +SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
> > +SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
> > +
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> >                      file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
> >                      file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
> 
>
Richard Purdie - March 5, 2013, 5:16 p.m.
On Tue, 2013-03-05 at 15:20 +0100, Martin Jansa wrote:
> On Tue, Mar 05, 2013 at 02:10:25PM +0000, Richard Purdie wrote:
> > On Mon, 2013-03-04 at 14:25 +0100, Martin Jansa wrote:
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > >  meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
> > >  meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
> > >  2 files changed, 7 insertions(+), 5 deletions(-)
> > 
> > "where it belongs"? Is this due to the avahi-ui recipe?
> 
> Yes, avahi-ui is overwriting PACKAGES and systemd.bbclass was showing
> warnings since this systemd was added to avahi.inc

In future please put that in the commit message. I added it this time...

And yes, I'm going to talk to others about commit messages too. They're
getting too short in general.

Cheers,

Richard
Martin Jansa - March 13, 2013, 4:45 p.m.
On Tue, Mar 05, 2013 at 05:16:09PM +0000, Richard Purdie wrote:
> On Tue, 2013-03-05 at 15:20 +0100, Martin Jansa wrote:
> > On Tue, Mar 05, 2013 at 02:10:25PM +0000, Richard Purdie wrote:
> > > On Mon, 2013-03-04 at 14:25 +0100, Martin Jansa wrote:
> > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > > ---
> > > >  meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
> > > >  meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
> > > >  2 files changed, 7 insertions(+), 5 deletions(-)
> > > 
> > > "where it belongs"? Is this due to the avahi-ui recipe?
> > 
> > Yes, avahi-ui is overwriting PACKAGES and systemd.bbclass was showing
> > warnings since this systemd was added to avahi.inc
> 
> In future please put that in the commit message. I added it this time...

Thanks for adding it, I've reported this issue with longer description
on 27 Feb 2013, then I forgot about it and because I got no reply from
developer who introduced it I've fixed later in hurry to get
meta-systemd parsing again.

Patch

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 3a4547c..51cbe38 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -37,11 +37,7 @@  USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \
                               -c \"Avahi autoip daemon\" \
                               avahi-autoipd"
 
-inherit autotools pkgconfig update-rc.d gettext systemd useradd
-
-SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
-SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
-SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
+inherit autotools pkgconfig update-rc.d gettext useradd
 
 EXTRA_OECONF = "--disable-introspection \
              --with-avahi-priv-access-group=adm \
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
index cff0974..22731f9 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
@@ -1,5 +1,11 @@ 
 require avahi.inc
 
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
+SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
+SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
+
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
                     file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \