summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-02-25 02:31:28 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-02-25 09:51:54 +0100
commit504f2e084cfd14778f223c807ab5250becd32a7a (patch)
tree6de370366d1895c1d6701616b3b7ac5f59b0caf3 /meta-oe
parentc9f5703aded908f2c61171abe2969e41d35028e2 (diff)
downloadmeta-openembedded-504f2e084cfd14778f223c807ab5250becd32a7a.tar.gz
systemd.bbclass: fix regression caused by c9f5703aded
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>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/classes/systemd.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 0329b904f..a8c77c8a1 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -28,6 +28,9 @@ systemctl disable ${SYSTEMD_SERVICE}
28 28
29def systemd_after_parse(d): 29def systemd_after_parse(d):
30 def systemd_check_vars(): 30 def systemd_check_vars():
31 if d.getVar('BB_WORKERCONTEXT', True) is not None:
32 return
33
31 bb_filename = d.getVar('FILE') 34 bb_filename = d.getVar('FILE')
32 packages = d.getVar('PACKAGES', 1) 35 packages = d.getVar('PACKAGES', 1)
33 36
@@ -66,11 +69,9 @@ def systemd_after_parse(d):
66 69
67 70
68 bpn = d.getVar('BPN', 1) 71 bpn = d.getVar('BPN', 1)
69 # not for native / only at parse time 72 if bpn + "-native" != d.getVar('PN', 1) and \
70 if d.getVar('BB_WORKERCONTEXT', True) is None and \ 73 bpn + "-cross" != d.getVar('PN', 1) and \
71 bpn + "-native" != d.getVar('PN', 1) and \ 74 bpn + "-nativesdk" != d.getVar('PN', 1):
72 bpn + "-cross" != d.getVar('PN', 1) and \
73 bpn + "-nativesdk" != d.getVar('PN', 1):
74 systemd_check_vars() 75 systemd_check_vars()
75 for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): 76 for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
76 systemd_create_package(pkg_systemd) 77 systemd_create_package(pkg_systemd)