Skip to contentSkip to conversation

avahi: move systemd support where it belongs

PATCH In review Martin Jansa 2 participants 5 messages Mar 4, 2013 – Mar 13, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 avahi: move systemd support where it belongs

---
 meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
 meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)
meta/recipes-connectivity/avahi/avahi.inc +1 -5
index 3a4547c..51cbe38 100644
@@ -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 \
meta/recipes-connectivity/avahi/avahi_0.6.31.bb +6 -0
index cff0974..22731f9 100644
@@ -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 \
Signature · 1 line
1.8.1.5
#1 lore raw
Quoted 5 lines · Martin Jansa
---
 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

Quoted 33 lines
meta/recipes-connectivity/avahi/avahi.inc +1 -5
index 3a4547c..51cbe38 100644
@@ -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 \
meta/recipes-connectivity/avahi/avahi_0.6.31.bb +6 -0
index cff0974..22731f9 100644
@@ -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 \
#2 lore raw
Quoted 8 lines · Richard Purdie
Quoted 5 lines · Martin Jansa
---
 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

Quoted 35 lines
Quoted 33 lines
meta/recipes-connectivity/avahi/avahi.inc +1 -5
index 3a4547c..51cbe38 100644
@@ -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 \
meta/recipes-connectivity/avahi/avahi_0.6.31.bb +6 -0
index cff0974..22731f9 100644
@@ -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 \
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw
Quoted 8 lines · Martin Jansa
Quoted 7 lines · Richard Purdie
Quoted 5 lines · Martin Jansa
---
 meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
 meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)
Quoted 4 lines
Quoted 1 line

"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

#4 lore raw
Quoted 9 lines · Richard Purdie
Quoted 8 lines · Martin Jansa
Quoted 7 lines · Richard Purdie
Quoted 5 lines · Martin Jansa
---
 meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
 meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

"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.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]