New commits:
commit fecf6094e953cd29e77a62fa6bfa291d3460ac5f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
utils/dbus: split meson and autotools build paths
for both branches
stable branch still uses autotools, hencewhy the split,
also, updated elogind patch for devel branch and made some quoting more
consistent
diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index dcf5890..8a9db3d 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -1,21 +1,26 @@
-OPTS+=" runtime_dir=/run" &&
-if spell_ok systemd; then
-# # if systemd is installed, then include this. Needed for systemd to work
- OPTS+=" systemd_system_unitdir=/lib/systemd/system" &&
- OPTS+=" runtime_dir=/run"
+if [[ "${DBUS_BRANCH}" == "devel" ]]; then
+ OPTS="runtime_dir=${TRACK_ROOT}/run ${OPTS}" &&
+ if [ "$DBUS_SELINUX" == "y" ]; then
+ OPTS="selinux=enabled ${OPTS}"
+ fi &&
+ # Glib2 is used for regression tests and can cause unnecessary build
failure
+ # when we're in a chain where libffi just has been updated and glib2 not
yet.
+ # Other solution would be to unnecessarily depend on glib2, or even
+ # dbus-glib, which just smells too circular.
+ OPTS="user_session=true modular_tests=disabled ${OPTS}"
+else
+ OPTS="--runstatedir=${TRACK_ROOT}/run ${OPTS}" &&
+ if [ "$DBUS_SELINUX" == "y" ]; then
+ OPTS="--enable-selinux ${OPTS}"
+ fi &&
+ OPTS="--enable-user-session --disable-modular-tests ${OPTS}"
fi &&
-if [ "$DBUS_SELINUX" == "y" ]; then
- OPTS+=" selinux=enabled"
-fi &&
-# Glib2 is used for regression tests and can cause unnecessary build failure
-# when we're in a chain where libffi just has been updated and glib2 not yet.
-# Other solution would be to unnecessarily depend on glib2, or even
-# dbus-glib, which just smells too circular.
-OPTS+=" user_session=true modular_tests=disabled"
create_account messagebus &&
-default_build