helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-29 04:13:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd.bbclass: Fixes for living along with multilib

Browse Source 
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>
This commit is contained in:
Khem Raj 2012-12-13 10:03:03 -08:00
parent 69b0e85b41
commit af1e1e3f55
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta-systemd/classes/systemd.bbclass
View File

@ -53,7 +53,9 @@ def systemd_after_parse(d):
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \ "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
(bb_filename, pkg_systemd) (bb_filename, pkg_systemd)
else: 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: if pkg_systemd_base not in packages:
raise bb.build.FuncFailed, \ raise bb.build.FuncFailed, \
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \ "\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) bpn = d.getVar('BPN', 1)
ml = d.getVar('MLPREFIX', 1) or ""
if bpn + "-native" != d.getVar('PN', 1) and \ if bpn + "-native" != d.getVar('PN', 1) and \
bpn + "-cross" != 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): "nativesdk-" + bpn != d.getVar('PN', 1):
systemd_check_vars() systemd_check_vars()
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():