aboutsummaryrefslogtreecommitdiffstats
path: root/meta-systemd
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-10-09 11:12:16 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2012-10-09 11:16:04 +0200
commitaff5f48fb89ae8427cbbd5341f3bd1d4e43582f6 (patch)
tree5c1b684fa748da57276a51e865eee24c2b161c14 /meta-systemd
parentedc5dd9a2247a38b38905f2bc41805aa91c0617f (diff)
downloadmeta-openembedded-aff5f48fb89ae8427cbbd5341f3bd1d4e43582f6.tar.gz
Revert "systemd.bbclass: Dont check for multilib and change for nativesdk renaming"
This triggers: ERROR: Nothing RPROVIDES 'connman-systemd' (but /OE/tentacle/sources/meta-angstrom/recipes-images/angstrom/systemd-image.bb RDEPENDS on or otherwise requires it) This reverts commit cbac8756e815c3f141cebf6d2e6875400980a4f9.
Diffstat (limited to 'meta-systemd')
-rw-r--r--meta-systemd/classes/systemd.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass
index d1f723613a..96d7f8f559 100644
--- a/meta-systemd/classes/systemd.bbclass
+++ b/meta-systemd/classes/systemd.bbclass
@@ -68,11 +68,9 @@ def systemd_after_parse(d):
bpn = d.getVar('BPN', 1)
- ml = d.getVar('MLPREFIX', 1)
if bpn + "-native" != d.getVar('PN', 1) and \
bpn + "-cross" != d.getVar('PN', 1) and \
- ml + bpn != d.getVar('PN', 1) and \
- "nativesdk-" + bpn != d.getVar('PN', 1):
+ bpn + "-nativesdk" != d.getVar('PN', 1):
systemd_check_vars()
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
systemd_create_package(pkg_systemd)