Patchwork systemd: skip in non-systemd distros to fix world builds

login
register
mail settings
Submitter Ross Burton
Date Jan. 21, 2013, 10:45 a.m.
Message ID <1358765132-16394-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/43045/
State Accepted
Commit a2553b5f8b80ca0cd578afa2d2857ebb2b70ee3c
Headers show

Comments

Ross Burton - Jan. 21, 2013, 10:45 a.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/systemd/systemd_196.bb |    8 ++++++++
 1 file changed, 8 insertions(+)

Patch

diff --git a/meta/recipes-core/systemd/systemd_196.bb b/meta/recipes-core/systemd/systemd_196.bb
index 1861437..85bb4f9 100644
--- a/meta/recipes-core/systemd/systemd_196.bb
+++ b/meta/recipes-core/systemd/systemd_196.bb
@@ -247,3 +247,11 @@  update-alternatives --remove reboot ${base_bindir}/systemctl
 update-alternatives --remove shutdown ${base_bindir}/systemctl
 update-alternatives --remove poweroff ${base_bindir}/systemctl
 }
+
+
+# As this recipe builds udev, respect the systemd DISTRO_FEATURE so we don't try
+# building udev and systemd in world builds.
+python () {
+    if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
+        raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
+}