From 504f2e084cfd14778f223c807ab5250becd32a7a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 25 Feb 2012 02:31:28 +0000 Subject: systemd.bbclass: fix regression caused by c9f5703aded The parsing condition was broken causing the packages not being expanded to include -systemd packages automatically. Signed-off-by: Otavio Salvador Signed-off-by: Koen Kooi --- meta-oe/classes/systemd.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'meta-oe/classes') 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) -- cgit v1.2.3-54-g00ecf