[OE-core] [PATCH] systemd: don't add files and dependencies from units Conflicts

[Erik Botö]

This patch works well for me. Any chance of it getting cherry-picked
into Daisy as well?

Cheers,
Erik

On Tue, Oct 7, 2014 at 12:10 AM, Ross Burton <ross.burton at intel.com> wrote:
> Adding dependencies and moving files based on Conflicts tags in unit files isn't
> right, mainly as it means that systemd depends on systemd-binfmt, because the
> latter ends up containing the shutdown.target unit.
>
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  meta/classes/systemd.bbclass |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
> index 708ba89..c34884b 100644
> --- a/meta/classes/systemd.bbclass
> +++ b/meta/classes/systemd.bbclass
> @@ -143,10 +143,7 @@ python systemd_populate_packages() {
>          if has_exactly_one_service:
>              has_exactly_one_service = len(get_package_var(d, 'SYSTEMD_SERVICE', systemd_packages).split()) == 1
>
> -        keys = 'Also' # Conflicts??
> -        if has_exactly_one_service:
> -            # single service gets also the /dev/null dummies
> -            keys = 'Also Conflicts'
> +        keys = 'Also'
>          # scan for all in SYSTEMD_SERVICE[]
>          for pkg_systemd in systemd_packages.split():
>              for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split():
> --
> 1.7.10.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core