From: Ross Burton Date: Mon, 6 Oct 2014 22:09:15 +0000 (+0100) Subject: systemd: don't add files and dependencies from units Conflicts X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~32133 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02767aac492cedf6ccd02648b8e65751cc23c11c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 --- diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 708ba892bda..c34884bd383 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():