From 7c39f21cbde23ad678ddf54cb54b7f01e971a325 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 25 Mar 2013 11:23:27 +0000 Subject: dbus: explicitly disable systemd when no systemd 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 --- meta/recipes-core/dbus/dbus.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/dbus/dbus.inc') diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index affffbc187..c64084f567 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 \ -- cgit 1.2.3-korg