diff options
| author |   Ross Burton <ross.burton@intel.com> | 2014-10-06 23:09:15 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:17:09 +0000 |
| commit | 9884e4f872b9ff354832053c86842dd0d3b0c8b3 (patch) | |
| tree | c8610ae6ecf672f7732fdc22638a0cb4f1394d62 | |
| parent | ae776a39376629bfada9bd5fabc949e9277774ba (diff) | |
| download | openembedded-core-contrib-9884e4f872b9ff354832053c86842dd0d3b0c8b3.tar.gz | |
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.
(From OE-Core rev: 02767aac492cedf6ccd02648b8e65751cc23c11c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/classes/systemd.bbclass | 5 |
1 files changed, 1 insertions, 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(): |