[oe-commits] Martin Jansa : systemd.bbclass: set INHIBIT_UPDATERCD_BBCLASS like oe-core does now

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 3dcb4f293beddcdc36fa44d35d3e1dfcd1deb3d2
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=3dcb4f293beddcdc36fa44d35d3e1dfcd1deb3d2

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Mar 28 14:45:03 2013 +0100

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

---

 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 f2a0363..4069367 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