From 02767aac492cedf6ccd02648b8e65751cc23c11c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Oct 2014 23:09:15 +0100 Subject: systemd: don't add files and dependencies from units Conflicts 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 --- 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 708ba892bd..c34884bd38 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(): -- cgit 1.2.3-korg