summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Kling <andreas.kling@peiker-cee.de>2017-02-15 07:15:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:49:52 -0800
commit4a234b5c0e27e110e9ae08777fa26835059fc9cb (patch)
tree3fea9954c705e14fbf60484f670d6486471827cb
parent5424dc2a21916216300449cf5c2724ca549aa5e5 (diff)
downloadpoky-4a234b5c0e27e110e9ae08777fa26835059fc9cb.tar.gz
dbus: do not use systemctl from host for configure
configure.ac from dbus uses $PATH to get the location of systemctl. If it is not found /usr/bin/systemctl is used. It is possible to override the location by passing SYSTEMCTL=[value] to configure. The value is used to replace @SYSTEMCTL@ in systemd-user/dbus.socket.in. dbus.socket sets the environment variable DBUS_SESSION_BUS_ADDRESS using systemctl. dbus does not depend on systemd-systemctl-native, so location from host installation or the default value gets used. Adding systemd-systemctl to the build would give path from sysroot. Forcing SYSTEMCTL=${base_bindir}/systemctl for target gives the correct path there and the environment variable is set after a user session was opened. [YOCTO #11002] (From OE-Core rev: e9471f8da3946439141ccdd8284200aa614df46c) Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus_1.10.14.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus_1.10.14.bb b/meta/recipes-core/dbus/dbus_1.10.14.bb
index f50aff89b7..d74560246e 100644
--- a/meta/recipes-core/dbus/dbus_1.10.14.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.14.bb
@@ -97,6 +97,7 @@ EXTRA_OECONF = "--disable-tests \
97 --disable-libaudit \ 97 --disable-libaudit \
98 " 98 "
99 99
100EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
100EXTRA_OECONF_append_class-native = " --disable-selinux" 101EXTRA_OECONF_append_class-native = " --disable-selinux"
101 102
102PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 103PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \