diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2012-12-13 10:03:03 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2013-01-08 09:31:51 -0800 |
| commit | af1e1e3f55050ab25ce3b6f37e3ee3b3b318f7e4 (patch) | |
| tree | 6fd91d992291300bc509cc87241f3c251f78651a /meta-systemd/classes | |
| parent | 69b0e85b415e8cf1b86cdc4251f7a16a8d1db4e4 (diff) | |
| download | meta-openembedded-af1e1e3f55050ab25ce3b6f37e3ee3b3b318f7e4.tar.gz | |
systemd.bbclass: Fixes for living along with multilib
This essentially fixes two problems
1. We were ignoring systemd for multilibs now we dont
2. We were replacing '-systemd' string in PN which is
a problem whenre -systemd appears more than once
e.g. lib32-systemd-units-system it was removing both
essentially we should only chop the end of PN if it
ends with '-systemd'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-systemd/classes')
| -rw-r--r-- | meta-systemd/classes/systemd.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass index 958249259a..16ac1fbf1e 100644 --- a/meta-systemd/classes/systemd.bbclass +++ b/meta-systemd/classes/systemd.bbclass @@ -53,7 +53,9 @@ def systemd_after_parse(d): "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \ (bb_filename, pkg_systemd) else: - pkg_systemd_base = pkg_systemd.replace('-systemd', '') + pkg_systemd_base = pkg_systemd + if pkg_systemd_base.endswith('-systemd'): + pkg_systemd_base = pkg_systemd[:-8] if pkg_systemd_base not in packages: raise bb.build.FuncFailed, \ "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \ @@ -68,9 +70,10 @@ def systemd_after_parse(d): bpn = d.getVar('BPN', 1) + ml = d.getVar('MLPREFIX', 1) or "" if bpn + "-native" != d.getVar('PN', 1) and \ bpn + "-cross" != d.getVar('PN', 1) and \ - not d.getVar('MLPREFIX', 1) and \ + 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(): |