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

systemd.bbclass: fix regression caused by c9f5703aded

Browse Source 
The parsing condition was broken causing the packages not being
expanded to include <PN>-systemd packages automatically.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Otavio Salvador 2012-02-25 02:31:28 +00:00 committed by Koen Kooi
parent c9f5703ade
commit 504f2e084c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta-oe/classes/systemd.bbclass
View File

@ -28,6 +28,9 @@ systemctl disable ${SYSTEMD_SERVICE}
def systemd_after_parse(d): def systemd_after_parse(d):
def systemd_check_vars(): def systemd_check_vars():
if d.getVar('BB_WORKERCONTEXT', True) is not None:
return
bb_filename = d.getVar('FILE') bb_filename = d.getVar('FILE')
packages = d.getVar('PACKAGES', 1) packages = d.getVar('PACKAGES', 1)
@ -66,11 +69,9 @@ def systemd_after_parse(d):
bpn = d.getVar('BPN', 1) bpn = d.getVar('BPN', 1)
# not for native / only at parse time if bpn + "-native" != d.getVar('PN', 1) and \
if d.getVar('BB_WORKERCONTEXT', True) is None and \ bpn + "-cross" != d.getVar('PN', 1) and \
bpn + "-native" != d.getVar('PN', 1) and \ bpn + "-nativesdk" != d.getVar('PN', 1):
bpn + "-cross" != d.getVar('PN', 1) and \
bpn + "-nativesdk" != 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():
systemd_create_package(pkg_systemd) systemd_create_package(pkg_systemd)