summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-10-06 23:09:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:18:31 +0000
commit3244f4540c08e4248a0f54d31e4797d2eb96faee (patch)
treed6add5839a2927cdd92c55edf1b10a3b5e582335 /meta/classes
parentec853e4eea537fb296746560973424038810c457 (diff)
downloadpoky-3244f4540c08e4248a0f54d31e4797d2eb96faee.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) (From OE-Core rev: 9884e4f872b9ff354832053c86842dd0d3b0c8b3) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/systemd.bbclass5
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() {
143 if has_exactly_one_service: 143 if has_exactly_one_service:
144 has_exactly_one_service = len(get_package_var(d, 'SYSTEMD_SERVICE', systemd_packages).split()) == 1 144 has_exactly_one_service = len(get_package_var(d, 'SYSTEMD_SERVICE', systemd_packages).split()) == 1
145 145
146 keys = 'Also' # Conflicts?? 146 keys = 'Also'
147 if has_exactly_one_service:
148 # single service gets also the /dev/null dummies
149 keys = 'Also Conflicts'
150 # scan for all in SYSTEMD_SERVICE[] 147 # scan for all in SYSTEMD_SERVICE[]
151 for pkg_systemd in systemd_packages.split(): 148 for pkg_systemd in systemd_packages.split():
152 for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split(): 149 for service in get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd).split():