From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com ([134.134.136.24]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1U0DIg-0001QA-Un for openembedded-core@lists.openembedded.org; Tue, 29 Jan 2013 16:40:55 +0100 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 29 Jan 2013 07:23:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,561,1355126400"; d="scan'208";a="278046930" Received: from dell-desktop (HELO localhost.localdomain) ([10.237.105.59]) by orsmga002.jf.intel.com with ESMTP; 29 Jan 2013 07:25:00 -0800 From: Radu Moisan To: openembedded-core@lists.openembedded.org Date: Tue, 29 Jan 2013 17:24:44 +0200 Message-Id: <1359473084-592-3-git-send-email-radu.moisan@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359473084-592-1-git-send-email-radu.moisan@intel.com> References: <1359473084-592-1-git-send-email-radu.moisan@intel.com> Subject: [PATCH 2/2] avahi: Remove -systemd postfix X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2013 15:41:00 -0000 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" -- 1.7.9.5