Patchwork [meta-systemd] systemd.bbclass: Dont check for multilib and change for nativesdk renaming

login
mail settings
Submitter Khem Raj
Date Oct. 9, 2012, 6:44 a.m.
Message ID <1349765046-7315-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/37953/
State Accepted
Commit cbac8756e815c3f141cebf6d2e6875400980a4f9
Headers show

Comments

Khem Raj - Oct. 9, 2012, 6:44 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-systemd/classes/systemd.bbclass |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

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)