From patchwork Tue Jan 29 15:24:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] avahi: Remove -systemd postfix Date: Tue, 29 Jan 2013 15:24:44 -0000 From: Radu Moisan X-Patchwork-Id: 43653 Message-Id: <1359473084-592-3-git-send-email-radu.moisan@intel.com> To: openembedded-core@lists.openembedded.org Signed-off-by: Radu Moisan --- meta/recipes-connectivity/avahi/avahi.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index d529b37..a02c8a5 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -64,9 +64,8 @@ do_configure_prepend() { } -PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" +PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" -FILES_avahi-systemd = "${systemd_unitdir}" FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/avahi/avahi-autoipd.action \ ${sysconfdir}/dhcp/*/avahi-autoipd \ @@ -84,7 +83,8 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${datadir}/avahi/avahi-service.dtd \ ${datadir}/avahi/service-types \ ${datadir}/dbus-1/interfaces \ - ${datadir}/dbus-1/system-services" + ${datadir}/dbus-1/system-services \ + ${@base_contains('DISTRO_FEATURES','systemd','${systemd_unitdir}','',d)}" FILES_libavahi-client = "${libdir}/libavahi-client.so.*" FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ @@ -94,7 +94,7 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" FILES_avahi-utils = "${bindir}/avahi-*" -RDEPENDS_avahi-systemd = "avahi-daemon" +RDEPENDS_avahi = "avahi-daemon" RDEPENDS_avahi-daemon = "sysvinit-pidof"