From 9b7a6b957b1d54abc767a15f62ee69a2d81fa3b1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 28 Mar 2013 14:45:03 +0100 Subject: [PATCH] systemd.bbclass: set INHIBIT_UPDATERCD_BBCLASS like oe-core does now Signed-off-by: Patrick Ohly --- meta-openembedded/meta-systemd/classes/systemd.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-openembedded/meta-systemd/classes/systemd.bbclass b/meta-openembedded/meta-systemd/classes/systemd.bbclass index f2a0363..4069367 100644 --- a/meta-openembedded/meta-systemd/classes/systemd.bbclass +++ b/meta-openembedded/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 -- 2.7.4