[oe-commits] Koen Kooi : avahi: enable systemd support, but package systemd files seperately

[git version control]

Module: openembedded-core.git
Branch: master
Commit: 8579478ebfc1774ea4315ae803c98a6b59fad55a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8579478ebfc1774ea4315ae803c98a6b59fad55a

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Fri May 27 11:32:37 2011 +0200

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 at dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-connectivity/avahi/avahi.inc       |    9 +++++++--
 meta/recipes-connectivity/avahi/avahi_0.6.30.bb |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index b2fa8ca..099c5a4 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 1084c04..e63f406 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"