MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-07-19 15:29:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

systemd.bbclass: do not mangle PACKAGES variable in native, nativesdk and cross

Browse Source 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Otavio Salvador 2012-02-24 20:55:17 +00:00 committed by Koen Kooi
parent a21a910dde
commit c9f5703ade
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
meta-oe/classes/systemd.bbclass
View File

@ -28,40 +28,34 @@ 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) bb_filename = d.getVar('FILE')
# not for native / only at parse time packages = d.getVar('PACKAGES', 1)
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')
packages = d.getVar('PACKAGES', 1)
# check SYSTEMD_PACKAGES # check SYSTEMD_PACKAGES
systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or "" systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or ""
if systemd_pkgs == "": if systemd_pkgs == "":
raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_PACKAGES" % bb_filename raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_PACKAGES" % bb_filename
for pkg_systemd in systemd_pkgs.split(): for pkg_systemd in systemd_pkgs.split():
if pkg_systemd.find("-systemd") == -1: if pkg_systemd.find("-systemd") == -1:
if pkg_systemd != d.getVar('PN', 1): if pkg_systemd != d.getVar('PN', 1):
raise bb.build.FuncFailed, \ raise bb.build.FuncFailed, \
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \
(bb_filename, pkg_systemd) (bb_filename, pkg_systemd)
else:
bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename)
else: else:
pkg_systemd_base = pkg_systemd.replace('-systemd', '') bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename)
if pkg_systemd_base not in packages: else:
raise bb.build.FuncFailed, \ pkg_systemd_base = pkg_systemd.replace('-systemd', '')
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ if pkg_systemd_base not in packages:
( bb_filename, pkg_systemd) raise bb.build.FuncFailed, \
"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \
( bb_filename, pkg_systemd)
# check SYSTEMD_SERVICE # check SYSTEMD_SERVICE
for pkg_systemd in systemd_pkgs.split(): for pkg_systemd in systemd_pkgs.split():
service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd
systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or "" systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or ""
if systemd_services == "": if systemd_services == "":
raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_SERVICE / %s" % (bb_filename, service_pkg) raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_SERVICE / %s" % (bb_filename, service_pkg)
# prepend systemd-packages not already included # prepend systemd-packages not already included
def systemd_create_package(pkg_systemd): def systemd_create_package(pkg_systemd):
@ -71,9 +65,15 @@ def systemd_after_parse(d):
d.setVar('PACKAGES', packages) d.setVar('PACKAGES', packages)
systemd_check_vars() bpn = d.getVar('BPN', 1)
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): # not for native / only at parse time
systemd_create_package(pkg_systemd) 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()
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
systemd_create_package(pkg_systemd)
python __anonymous() { python __anonymous() {