[oe-commits] Koen Kooi : Revert "systemd.bbclass: Dont check for multilib and change for nativesdk renaming"

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: aff5f48fb89ae8427cbbd5341f3bd1d4e43582f6
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=aff5f48fb89ae8427cbbd5341f3bd1d4e43582f6

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Tue Oct  9 11:12:16 2012 +0200

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.

---

 meta-systemd/classes/systemd.bbclass |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass
index d1f7236..96d7f8f 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)