summaryrefslogtreecommitdiffstats
path: root/meta
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:16:14 +0000
commit9589531d2358bba51f1613d7f5195c84df892af6 (patch)
tree79ac5f96f6e90db36c7c773e0480386b282b4a69 /meta
parent712b42c1efb30335ff64456bfa14a589bbbdaeca (diff)
downloadpoky-9589531d2358bba51f1613d7f5195c84df892af6.tar.gz
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. (From OE-Core rev: 02492d43cd7095acb3cf29843a50444c28b4d994) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 \
37 -c \"Avahi autoip daemon\" \ 37 -c \"Avahi autoip daemon\" \
38 avahi-autoipd" 38 avahi-autoipd"
39 39
40inherit autotools pkgconfig update-rc.d gettext systemd useradd 40inherit autotools pkgconfig update-rc.d gettext useradd
41
42SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
43SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
44SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
45 41
46EXTRA_OECONF = "--disable-introspection \ 42EXTRA_OECONF = "--disable-introspection \
47 --with-avahi-priv-access-group=adm \ 43 --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 @@
1require avahi.inc 1require avahi.inc
2 2
3inherit systemd
4
5SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
6SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
7SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
8
3LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 9LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
4 file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ 10 file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
5 file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ 11 file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \