From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 28 Mar 2013 13:45:03 +0000 (+0100)
Subject: systemd.bbclass: set INHIBIT_UPDATERCD_BBCLASS like oe-core does now
X-Git-Tag: rev_ivi_2015_02_04~3447
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b7a6b957b1d54abc767a15f62ee69a2d81fa3b1;p=scm%2Fbb%2Ftizen-distro.git

systemd.bbclass: set INHIBIT_UPDATERCD_BBCLASS like oe-core does now

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

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