[oe-commits] Otavio Salvador : systemd.bbclass: fix regression caused by c9f5703aded
git at git.openembedded.org
git at git.openembedded.org
Sat Feb 25 08:54:12 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: 504f2e084cfd14778f223c807ab5250becd32a7a
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=504f2e084cfd14778f223c807ab5250becd32a7a
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Sat Feb 25 02:31:28 2012 +0000
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 at ossystems.com.br>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
meta-oe/classes/systemd.bbclass | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 0329b90..a8c77c8 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -28,6 +28,9 @@ systemctl disable ${SYSTEMD_SERVICE}
def systemd_after_parse(d):
def systemd_check_vars():
+ if d.getVar('BB_WORKERCONTEXT', True) is not None:
+ return
+
bb_filename = d.getVar('FILE')
packages = d.getVar('PACKAGES', 1)
@@ -66,11 +69,9 @@ def systemd_after_parse(d):
bpn = d.getVar('BPN', 1)
- # not for native / only at parse time
- if d.getVar('BB_WORKERCONTEXT', True) is None and \
- bpn + "-native" != d.getVar('PN', 1) and \
- bpn + "-cross" != d.getVar('PN', 1) and \
- bpn + "-nativesdk" != d.getVar('PN', 1):
+ if bpn + "-native" != d.getVar('PN', 1) and \
+ bpn + "-cross" != d.getVar('PN', 1) and \
+ bpn + "-nativesdk" != d.getVar('PN', 1):
systemd_check_vars()
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
systemd_create_package(pkg_systemd)
More information about the Openembedded-commits
mailing list