From e9448387aeab21309a2f5577496a53b3f212e8a9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 27 May 2011 11:32:37 +0200 Subject: avahi: enable systemd support, but package systemd files seperately Systemd support in avahi only affects 'make install', so no changes for sysvinit based systems (From OE-Core rev: 8579478ebfc1774ea4315ae803c98a6b59fad55a) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- 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 b2fa8ca949..099c5a4c2d 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 1084c0452e..e63f40645e 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" -- cgit v1.2.3-54-g00ecf