summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-25 11:23:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:42:38 +0000
commit7c39f21cbde23ad678ddf54cb54b7f01e971a325 (patch)
treebe0bb30c019fcd85dcf65d4bbb195e7b669884ba
parentc254ab4e3bdc4a3ba18e89219594fffa7895184d (diff)
downloadopenembedded-core-7c39f21cbde23ad678ddf54cb54b7f01e971a325.tar.gz
openembedded-core-7c39f21cbde23ad678ddf54cb54b7f01e971a325.tar.bz2
openembedded-core-7c39f21cbde23ad678ddf54cb54b7f01e971a325.zip
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 <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/dbus/dbus.inc4
1 files changed, 2 insertions, 2 deletions
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 \