[oe-commits] Khem Raj : systemd.bbclass: Dont check for multilib and change for nativesdk renaming

[git at git.openembedded.org]

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

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Oct  9 06:44:06 2012 +0000

systemd.bbclass: Dont check for multilib and change for nativesdk renaming

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

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

diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass
index 96d7f8f..d1f7236 100644
--- a/meta-systemd/classes/systemd.bbclass
+++ b/meta-systemd/classes/systemd.bbclass
@@ -68,9 +68,11 @@ 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 \
-            bpn + "-nativesdk" != d.getVar('PN', 1):
+            ml + bpn != d.getVar('PN', 1) and \
+            "nativesdk-" + bpn != d.getVar('PN', 1):
         systemd_check_vars()
         for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
             systemd_create_package(pkg_systemd)