diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-02-24 20:55:17 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-24 23:42:16 +0100 |
commit | c9f5703aded908f2c61171abe2969e41d35028e2 (patch) | |
tree | 6ab0523b8016fba7b0e7c82672ce9a80276370bd /meta-oe/classes | |
parent | a21a910dde8b330705f0f651d26f9fd8862e9229 (diff) | |
download | meta-openembedded-c9f5703aded908f2c61171abe2969e41d35028e2.tar.gz |
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>
Diffstat (limited to 'meta-oe/classes')
-rw-r--r-- | meta-oe/classes/systemd.bbclass | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index dd423b5c64..0329b904f1 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -28,40 +28,34 @@ systemctl disable ${SYSTEMD_SERVICE} def systemd_after_parse(d): 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') - packages = d.getVar('PACKAGES', 1) - - # check SYSTEMD_PACKAGES - systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or "" - if systemd_pkgs == "": - raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_PACKAGES" % bb_filename - for pkg_systemd in systemd_pkgs.split(): - if pkg_systemd.find("-systemd") == -1: - if pkg_systemd != d.getVar('PN', 1): - raise bb.build.FuncFailed, \ - "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ - (bb_filename, pkg_systemd) - else: - bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename) + bb_filename = d.getVar('FILE') + packages = d.getVar('PACKAGES', 1) + + # check SYSTEMD_PACKAGES + systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or "" + if systemd_pkgs == "": + raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_PACKAGES" % bb_filename + for pkg_systemd in systemd_pkgs.split(): + if pkg_systemd.find("-systemd") == -1: + if pkg_systemd != d.getVar('PN', 1): + raise bb.build.FuncFailed, \ + "\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \ + (bb_filename, pkg_systemd) else: - pkg_systemd_base = pkg_systemd.replace('-systemd', '') - if pkg_systemd_base not in packages: - 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 - for pkg_systemd in systemd_pkgs.split(): - service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd - systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or "" - if systemd_services == "": - raise bb.build.FuncFailed, "\n\n%s inherits systemd but doesn't set SYSTEMD_SERVICE / %s" % (bb_filename, service_pkg) + bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename) + else: + pkg_systemd_base = pkg_systemd.replace('-systemd', '') + if pkg_systemd_base not in packages: + 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 + for pkg_systemd in systemd_pkgs.split(): + service_pkg = 'SYSTEMD_SERVICE' + "_" + pkg_systemd + systemd_services = d.getVar(service_pkg, 1) or d.getVar('SYSTEMD_SERVICE', 1) or "" + if systemd_services == "": + 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 def systemd_create_package(pkg_systemd): @@ -71,9 +65,15 @@ def systemd_after_parse(d): d.setVar('PACKAGES', packages) - systemd_check_vars() - for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): - systemd_create_package(pkg_systemd) + 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() + for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): + systemd_create_package(pkg_systemd) python __anonymous() { |