summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-05-27 11:32:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-27 13:16:21 +0100
commit8579478ebfc1774ea4315ae803c98a6b59fad55a (patch)
tree0af0fedb18e27477c6e2ccadf165471a2e5c476b
parentc98657d8cfa17d5b94695f71cc336c697ca93302 (diff)
downloadopenembedded-core-8579478ebfc1774ea4315ae803c98a6b59fad55a.tar.gz
openembedded-core-8579478ebfc1774ea4315ae803c98a6b59fad55a.tar.bz2
openembedded-core-8579478ebfc1774ea4315ae803c98a6b59fad55a.tar.xz
openembedded-core-8579478ebfc1774ea4315ae803c98a6b59fad55a.zip
avahi: enable systemd support, but package systemd files seperately
Systemd support in avahi only affects 'make install', so no changes for sysvinit based systems Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc9
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.6.30.bb2
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index b2fa8ca94..099c5a4c2 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -37,9 +37,14 @@ EXTRA_OECONF = "--with-distro=debian \
--disable-qt3 \
--disable-qt4 \
--disable-python \
- --disable-doxygen-doc"
+ --disable-doxygen-doc \
+ --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
+"
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev"
+PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev"
+
+FILES_avahi-systemd = "${base_libdir}/systemd"
+RDEPENDS_avahi-systemd = "avahi-daemon"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index 1084c0452..e63f40645 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
RDEPENDS_avahi-daemon = "sysvinit-pidof"
-PR = "r0"
+PR = "r1"
EXTRA_OECONF += "--disable-gtk3"