* [PATCH] avahi: move systemd support where it belongs
@ 2013-03-04 13:25 Martin Jansa
2013-03-05 14:10 ` Richard Purdie
0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2013-03-04 13:25 UTC (permalink / raw)
To: openembedded-core
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(-)
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 \
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] avahi: move systemd support where it belongs
2013-03-04 13:25 [PATCH] avahi: move systemd support where it belongs Martin Jansa
@ 2013-03-05 14:10 ` Richard Purdie
2013-03-05 14:20 ` Martin Jansa
0 siblings, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2013-03-05 14:10 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
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 \
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] avahi: move systemd support where it belongs
2013-03-05 14:10 ` Richard Purdie
@ 2013-03-05 14:20 ` Martin Jansa
2013-03-05 17:16 ` Richard Purdie
0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2013-03-05 14:20 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2352 bytes --]
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 \
>
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] avahi: move systemd support where it belongs
2013-03-05 14:20 ` Martin Jansa
@ 2013-03-05 17:16 ` Richard Purdie
2013-03-13 16:45 ` Martin Jansa
0 siblings, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2013-03-05 17:16 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] avahi: move systemd support where it belongs
2013-03-05 17:16 ` Richard Purdie
@ 2013-03-13 16:45 ` Martin Jansa
0 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2013-03-13 16:45 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]
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.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-03-13 17:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-04 13:25 [PATCH] avahi: move systemd support where it belongs Martin Jansa
2013-03-05 14:10 ` Richard Purdie
2013-03-05 14:20 ` Martin Jansa
2013-03-05 17:16 ` Richard Purdie
2013-03-13 16:45 ` Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox