diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2012-02-25 02:31:28 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-02-25 09:51:54 +0100 |
| commit | 504f2e084cfd14778f223c807ab5250becd32a7a (patch) | |
| tree | 6de370366d1895c1d6701616b3b7ac5f59b0caf3 /meta-oe | |
| parent | c9f5703aded908f2c61171abe2969e41d35028e2 (diff) | |
| download | meta-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.bbclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index 0329b904f1..a8c77c8a17 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) |