summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-03-04 14:25:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 17:14:40 +0000
commit02492d43cd7095acb3cf29843a50444c28b4d994 (patch)
tree8e944aefcc5a16fba5627a40ebad56520a733b58 /meta/recipes-connectivity/avahi
parent8f2ae03dd950e119d9c06cecfa57d69edcf293be (diff)
downloadopenembedded-core-02492d43cd7095acb3cf29843a50444c28b4d994.tar.gz
openembedded-core-02492d43cd7095acb3cf29843a50444c28b4d994.tar.bz2
openembedded-core-02492d43cd7095acb3cf29843a50444c28b4d994.zip
avahi: move systemd support where it belongs
We don't want the systemd inherit in avahi-ui since that causes various warnings since PACKAGES is rewritten. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc6
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.6.31.bb6
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 1b7e26a1ca..28e37b998a 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 cff097449f..22731f9cb6 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 \