[oe-commits] Ross Burton : systemd: don' t add files and dependencies from units Conflicts
git at git.openembedded.org
git at git.openembedded.org
Tue Nov 4 10:28:58 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 02767aac492cedf6ccd02648b8e65751cc23c11c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=02767aac492cedf6ccd02648b8e65751cc23c11c
Author: Ross Burton <ross.burton at intel.com>
Date: Mon Oct 6 23:09:15 2014 +0100
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 <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():
More information about the Openembedded-commits
mailing list