mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
committed by
Koen Kooi
parent
a21a910dde
commit
c9f5703ade
@@ -28,12 +28,6 @@ systemctl disable ${SYSTEMD_SERVICE}
|
|||||||
|
|
||||||
def systemd_after_parse(d):
|
def systemd_after_parse(d):
|
||||||
def systemd_check_vars():
|
def systemd_check_vars():
|
||||||
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):
|
|
||||||
bb_filename = d.getVar('FILE')
|
bb_filename = d.getVar('FILE')
|
||||||
packages = d.getVar('PACKAGES', 1)
|
packages = d.getVar('PACKAGES', 1)
|
||||||
|
|
||||||
@@ -71,6 +65,12 @@ def systemd_after_parse(d):
|
|||||||
d.setVar('PACKAGES', packages)
|
d.setVar('PACKAGES', packages)
|
||||||
|
|
||||||
|
|
||||||
|
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):
|
||||||
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)
|
||||||
|
|||||||
Reference in New Issue
Block a user