[PATCH 0/2] Remove -systemd postfix

[PATCH 0/2] Remove -systemd postfix

[Radu Moisan]

Radu Moisan (2):
  systemd: Remove -systemd postfix
  avahi: Remove -systemd postfix

 meta/recipes-connectivity/avahi/avahi.inc |    8 ++++----
 meta/recipes-core/systemd/systemd_196.bb  |    9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

-- 
1.7.9.5

[PATCH 1/2] systemd: Remove -systemd postfix

[Radu Moisan]

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
 meta/recipes-core/systemd/systemd_196.bb |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_196.bb b/meta/recipes-core/systemd/systemd_196.bb
index 2854aae..69a4387 100644
--- a/meta/recipes-core/systemd/systemd_196.bb
+++ b/meta/recipes-core/systemd/systemd_196.bb
@@ -171,7 +171,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
@@ -188,7 +188,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"
 
@@ -218,6 +218,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"
@@ -225,9 +227,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

Re: [PATCH 1/2] systemd: Remove -systemd postfix

[Burton, Ross]

On 29 January 2013 15:24, Radu Moisan <radu.moisan@intel.com> wrote:
> Signed-off-by: Radu Moisan <radu.moisan@intel.com>

Acked-by: Ross Burton <ross.burton@intel.com>

Ross

[PATCH 2/2] avahi: Remove -systemd postfix

[Radu Moisan]

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

Re: [PATCH 2/2] avahi: Remove -systemd postfix

[Burton, Ross]

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

Re: [PATCH 2/2] avahi: Remove -systemd postfix

[Andreas Müller]

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

Re: [PATCH 2/2] avahi: Remove -systemd postfix

[Burton, Ross]

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

Re: [PATCH 0/2] Remove -systemd postfix

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

On Tue, Jan 29, 2013 at 05:24:42PM +0200, Radu Moisan wrote:
> 
> Radu Moisan (2):
>   systemd: Remove -systemd postfix
>   avahi: Remove -systemd postfix
> 
>  meta/recipes-connectivity/avahi/avahi.inc |    8 ++++----
>  meta/recipes-core/systemd/systemd_196.bb  |    9 ++++-----
>  2 files changed, 8 insertions(+), 9 deletions(-)

No upgrade path for both.

Wasn't systemd already upgraded to 197 in master?

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 0/2] Remove -systemd postfix

[Burton, Ross]

On 29 January 2013 15:56, Martin Jansa <martin.jansa@gmail.com> wrote:
> No upgrade path for both.

Do we really need to add an upgrade path for packages that have only
exists in git master for a week?  I can understand the desire, but
we're not talking about a release-release upgrade path but an upgrade
that will only hit people who are using oe-core's systemd support
right now.  I suspect that's a fairly small number outside of the
developers.

Ross

Re: [PATCH 0/2] Remove -systemd postfix

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

There were in meta-systemd for much longer.


On Tue, Jan 29, 2013 at 5:12 PM, Burton, Ross <ross.burton@intel.com> wrote:

> On 29 January 2013 15:56, Martin Jansa <martin.jansa@gmail.com> wrote:
> > No upgrade path for both.
>
> Do we really need to add an upgrade path for packages that have only
> exists in git master for a week?  I can understand the desire, but
> we're not talking about a release-release upgrade path but an upgrade
> that will only hit people who are using oe-core's systemd support
> right now.  I suspect that's a fairly small number outside of the
> developers.
>
> Ross
>

[-- Attachment #2: Type: text/html, Size: 1084 bytes --]

Re: [PATCH 0/2] Remove -systemd postfix

[Burton, Ross]

On 29 January 2013 16:20, Martin Jansa <martin.jansa@gmail.com> wrote:
> There were in meta-systemd for much longer.

Isn't the upgrade path from meta-systemd already broken?... :/

Ross

Re: [PATCH 0/2] Remove -systemd postfix

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 457 bytes --]

Yes by missing PE bump and similar change removing dbus-systemd in oe-core.
But sofar it's only 30 ERROR messages in bitbake log and 1 package to
upgrade manualyl.


On Tue, Jan 29, 2013 at 5:22 PM, Burton, Ross <ross.burton@intel.com> wrote:

> On 29 January 2013 16:20, Martin Jansa <martin.jansa@gmail.com> wrote:
> > There were in meta-systemd for much longer.
>
> Isn't the upgrade path from meta-systemd already broken?... :/
>
> Ross
>

[-- Attachment #2: Type: text/html, Size: 904 bytes --]