diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-03-28 14:45:03 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-04 08:14:21 +0200 |
| commit | 3dcb4f293beddcdc36fa44d35d3e1dfcd1deb3d2 (patch) | |
| tree | d63262a8df475b5c024e1a39d1db186d24cf3b4f /meta-systemd | |
| parent | 8bfd395b06fdf68919b271089dde198213bbe54c (diff) | |
| download | meta-openembedded-contrib-3dcb4f293beddcdc36fa44d35d3e1dfcd1deb3d2.tar.gz | |
systemd.bbclass: set INHIBIT_UPDATERCD_BBCLASS like oe-core does now
Diffstat (limited to 'meta-systemd')
| -rw-r--r-- | meta-systemd/classes/systemd.bbclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass index f2a0363361..4069367426 100644 --- a/meta-systemd/classes/systemd.bbclass +++ b/meta-systemd/classes/systemd.bbclass @@ -33,6 +33,14 @@ def get_package_var(d, var, pkg): return val def systemd_after_parse(d): + features = d.getVar("DISTRO_FEATURES", True).split() + # If the distro features have systemd but not sysvinit, inhibit update-rcd + # from doing any work so that pure-systemd images don't have redundant init + # files. + if "systemd" in features: + if "sysvinit" not in features: + d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") + def systemd_check_vars(): if d.getVar('BB_WORKERCONTEXT', True) is not None: return |