From: Radu Moisan <radu.moisan@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/2] avahi: Remove -systemd postfix
Date: Tue, 29 Jan 2013 17:24:44 +0200 [thread overview]
Message-ID: <1359473084-592-3-git-send-email-radu.moisan@intel.com> (raw)
In-Reply-To: <1359473084-592-1-git-send-email-radu.moisan@intel.com>
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
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
next prev parent reply other threads:[~2013-01-29 15:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-29 15:24 [PATCH 0/2] Remove -systemd postfix Radu Moisan
2013-01-29 15:24 ` [PATCH 1/2] systemd: " Radu Moisan
2013-01-29 15:51 ` Burton, Ross
2013-01-29 15:24 ` Radu Moisan [this message]
2013-01-29 15:51 ` [PATCH 2/2] avahi: " Burton, Ross
2013-01-29 15:57 ` Andreas Müller
2013-01-29 16:02 ` Burton, Ross
2013-01-29 15:56 ` [PATCH 0/2] " Martin Jansa
2013-01-29 16:12 ` Burton, Ross
2013-01-29 16:20 ` Martin Jansa
2013-01-29 16:22 ` Burton, Ross
2013-01-29 20:15 ` Martin Jansa
-- strict thread matches above, loose matches on Subject: below --
2013-01-30 7:38 [PATCH 0/2 v2] " Radu Moisan
2013-01-30 7:38 ` [PATCH 2/2] avahi: " Radu Moisan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359473084-592-3-git-send-email-radu.moisan@intel.com \
--to=radu.moisan@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox