diff options
author | Ross Burton <ross.burton@intel.com> | 2013-03-25 11:23:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-26 22:43:04 +0000 |
commit | c5b61252926c9deec0596f998d5cfe672630e89c (patch) | |
tree | 773cac0703a229935d47a0052a82e2fe477a346d /meta | |
parent | 6f77bf093de0bb9ac060e053acae0d06a62ca4e1 (diff) | |
download | poky-c5b61252926c9deec0596f998d5cfe672630e89c.tar.gz |
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.
(From OE-Core rev: 7c39f21cbde23ad678ddf54cb54b7f01e971a325)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 4 |
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() { | |||
68 | EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" | 68 | EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" |
69 | EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch" | 69 | EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch" |
70 | # TODO: would like to --enable-systemd but that's a circular build-dependency | 70 | # TODO: would like to --enable-systemd but that's a circular build-dependency |
71 | # between systemd <->dbus | 71 | # between systemd<->dbus |
72 | EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)}" | 72 | EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" |
73 | 73 | ||
74 | EXTRA_OECONF = "--disable-tests \ | 74 | EXTRA_OECONF = "--disable-tests \ |
75 | --disable-checks \ | 75 | --disable-checks \ |