Patchwork [22/24] dbus: explicitly disable systemd when no systemd

login
register
mail settings
Submitter Ross Burton
Date March 26, 2013, 4:50 p.m.
Message ID <c923eb2b2240ffd057a7777dea6cbc241c807a97.1364316412.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/46995/
State Accepted
Commit 7c39f21cbde23ad678ddf54cb54b7f01e971a325
Headers show

Comments

Ross Burton - March 26, 2013, 4:50 p.m.
If systemd isn't a distro feature, explicitly disable the systemd unit path
check as otherwise it will search the sysroot.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/dbus/dbus.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index affffbc..c64084f 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -68,8 +68,8 @@  pkg_postinst_dbus() {
 EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
 EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch"
 # TODO: would like to --enable-systemd but that's a circular build-dependency
-# between systemd <->dbus
-EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)}"
+# between systemd<->dbus
+EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
 EXTRA_OECONF = "--disable-tests \
                 --disable-checks \