* [PATCH 2/2] avahi: Remove -systemd postfix
2013-01-29 15:24 [PATCH 0/2] " Radu Moisan
@ 2013-01-29 15:24 ` Radu Moisan
2013-01-29 15:51 ` Burton, Ross
2013-01-29 15:57 ` Andreas Müller
0 siblings, 2 replies; 7+ messages in thread
From: Radu Moisan @ 2013-01-29 15:24 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] avahi: Remove -systemd postfix
2013-01-29 15:24 ` [PATCH 2/2] avahi: " Radu Moisan
@ 2013-01-29 15:51 ` Burton, Ross
2013-01-29 15:57 ` Andreas Müller
1 sibling, 0 replies; 7+ messages in thread
From: Burton, Ross @ 2013-01-29 15:51 UTC (permalink / raw)
To: Radu Moisan; +Cc: openembedded-core
On 29 January 2013 15:24, Radu Moisan <radu.moisan@intel.com> wrote:
>-RDEPENDS_avahi-systemd = "avahi-daemon"
> +RDEPENDS_avahi = "avahi-daemon"
The avahi package isn't really used, so this chunk should just be deleted.
Ross
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] avahi: Remove -systemd postfix
2013-01-29 15:24 ` [PATCH 2/2] avahi: " Radu Moisan
2013-01-29 15:51 ` Burton, Ross
@ 2013-01-29 15:57 ` Andreas Müller
2013-01-29 16:02 ` Burton, Ross
1 sibling, 1 reply; 7+ messages in thread
From: Andreas Müller @ 2013-01-29 15:57 UTC (permalink / raw)
To: Radu Moisan; +Cc: openembedded-core
On Tue, Jan 29, 2013 at 4:24 PM, Radu Moisan <radu.moisan@intel.com> wrote:
> 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"
I thought the discussion where to put systemd-files is still open.
Don't misunderstand me: I am fine with both but I think we should
decide to go this or that direction not by creating facts.
Andreas
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] avahi: Remove -systemd postfix
2013-01-29 15:57 ` Andreas Müller
@ 2013-01-29 16:02 ` Burton, Ross
0 siblings, 0 replies; 7+ messages in thread
From: Burton, Ross @ 2013-01-29 16:02 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-core
On 29 January 2013 15:57, Andreas Müller <schnitzeltony@googlemail.com> wrote:
> I thought the discussion where to put systemd-files is still open.
> Don't misunderstand me: I am fine with both but I think we should
> decide to go this or that direction not by creating facts.
I'm not convinced that the use case of "install a service but not the
init files so it doesn't auto-start" is good enough considering
systemd provides tools to not start it, and we've never had this
problem with sysvinit.
So no, I don't think its still open.
Ross
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 0/2 v2] Remove -systemd postfix
@ 2013-01-30 7:38 Radu Moisan
2013-01-30 7:38 ` [PATCH 1/2] systemd: " Radu Moisan
2013-01-30 7:38 ` [PATCH 2/2] avahi: " Radu Moisan
0 siblings, 2 replies; 7+ messages in thread
From: Radu Moisan @ 2013-01-30 7:38 UTC (permalink / raw)
To: openembedded-core
rebased so that the patch applies on systemd 197
removed RDEPENDS for avahi as Ross suggested
Radu Moisan (2):
systemd: Remove -systemd postfix
avahi: Remove -systemd postfix
meta/recipes-connectivity/avahi/avahi.inc | 8 +++-----
meta/recipes-core/systemd/systemd_197.bb | 9 ++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] systemd: Remove -systemd postfix
2013-01-30 7:38 [PATCH 0/2 v2] Remove -systemd postfix Radu Moisan
@ 2013-01-30 7:38 ` Radu Moisan
2013-01-30 7:38 ` [PATCH 2/2] avahi: " Radu Moisan
1 sibling, 0 replies; 7+ messages in thread
From: Radu Moisan @ 2013-01-30 7:38 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
meta/recipes-core/systemd/systemd_197.bb | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index 500c3ec..ba86127 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -173,7 +173,7 @@ FILES_${PN} = " ${base_bindir}/* \
FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
-RDEPENDS_${PN} += "dbus udev-systemd"
+RDEPENDS_${PN} += "dbus udev"
# kbd -> loadkeys,setfont
# systemd calls 'modprobe -sab --', which busybox doesn't support due to lack
@@ -190,7 +190,7 @@ RRECOMMENDS_${PN} += "systemd-serialgetty \
kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
"
-PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-systemd"
+PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils"
FILES_udev-dbg += "/lib/udev/.debug"
@@ -220,6 +220,8 @@ FILES_udev += "${base_sbindir}/udevd \
/lib/udev/rules.d/95*.rules \
${base_libdir}/udev/hwdb.d \
${sysconfdir}/udev \
+ ${systemd_unitdir}/system/*udev* \
+ ${systemd_unitdir}/system/*.wants/*udev* \
"
FILES_udev-consolekit += "/lib/ConsoleKit"
@@ -227,9 +229,6 @@ RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'console
FILES_udev-utils = "${bindir}/udevadm"
-FILES_udev-systemd = "${systemd_unitdir}/system/*udev* ${systemd_unitdir}/system/*.wants/*udev*"
-RDEPENDS_udev-systemd = "udev"
-
# TODO:
# u-a for runlevel and telinit
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] avahi: Remove -systemd postfix
2013-01-30 7:38 [PATCH 0/2 v2] Remove -systemd postfix Radu Moisan
2013-01-30 7:38 ` [PATCH 1/2] systemd: " Radu Moisan
@ 2013-01-30 7:38 ` Radu Moisan
1 sibling, 0 replies; 7+ messages in thread
From: Radu Moisan @ 2013-01-30 7:38 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index d529b37..317a592 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,8 +94,6 @@ 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-daemon = "sysvinit-pidof"
# uclibc has no nss
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-01-30 7:54 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-30 7:38 [PATCH 0/2 v2] Remove -systemd postfix Radu Moisan
2013-01-30 7:38 ` [PATCH 1/2] systemd: " Radu Moisan
2013-01-30 7:38 ` [PATCH 2/2] avahi: " Radu Moisan
-- strict thread matches above, loose matches on Subject: below --
2013-01-29 15:24 [PATCH 0/2] " Radu Moisan
2013-01-29 15:24 ` [PATCH 2/2] avahi: " Radu Moisan
2013-01-29 15:51 ` Burton, Ross
2013-01-29 15:57 ` Andreas Müller
2013-01-29 16:02 ` Burton, Ross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox