sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

systemd.bbclass: use PACKAGESPLITFUNCS instead of populate_packages_prepend 

This is cleaner and leads to more accurate profiles.

(From OE-Core rev: eed7294ba9aedf47af5c64ff11777015e59f48ef)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2013-02-11 16:01:20 +00:00 committed by Richard Purdie
parent ce3d50899d
commit 2c87657be9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meta/classes/systemd.bbclass
View File

@ -10,7 +10,7 @@ SYSTEMD_AUTO_ENABLE ??= "enable"
# even if the systemd DISTRO_FEATURE isn't enabled. As such don't make any
# changes directly but check the DISTRO_FEATURES first.
python __anonymous() {
if oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
if "systemd" in d.getVar("DISTRO_FEATURES", True).split():
d.appendVar("DEPENDS", " systemd-systemctl-native")
# Set a variable so that update-rcd.bbclass knows we're active and can
# disable itself.
@ -39,7 +39,10 @@ fi
systemctl disable ${SYSTEMD_SERVICE}
}
def systemd_populate_packages(d):
python systemd_populate_packages() {
if "systemd" not in d.getVar("DISTRO_FEATURES", True).split():
return
def get_package_var(d, var, pkg):
val = (d.getVar('%s_%s' % (var, pkg), True) or "").strip()
if val == "":
@ -150,9 +153,6 @@ def systemd_populate_packages(d):
systemd_generate_package_scripts(pkg)
systemd_add_rdepends(pkg)
systemd_check_services()
python populate_packages_prepend () {
if oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
systemd_populate_packages (d)
}
PACKAGESPLITFUNCS_prepend = "systemd_populate_packages "