[Lunar-commits] <moonbase-core> dbus: Cleanup build and enable systemd support

[Stefan Wold]

commit c78e872ddce7bd9973a6e3722793ac24906e3cf4
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 16 Aug 2014 22:17:16 +0200
URL: https://github.com/lunar-linux/moonbase-core/commit/c78e872ddce7bd9973a6e3722793ac24906e3cf4

dbus: Cleanup build and enable systemd support

Ugly hack using module_installed systemd to avoid cyclic dependency.
---
  system/dbus/BUILD | +28/-31   
  1 file changed, 28 insertions(+), 31 deletions(-)

--- a/system/dbus/BUILD
+++ b/system/dbus/BUILD
@@ -1,36 +1,33 @@
-(
+if kernel_option_present CONFIG_INOTIFY_USER ; then
+  OPTS+=" --enable-inotify"
+else
+  OPTS+=" --disable-inotify"
+fi
 
-  rm -fr /lib/systemd/system/dbus.target.wants/dbus.socket
-  rm -fr /lib/systemd/system/sockets.target.wants/dbus.socket
-  rm -fr /lib/systemd/system/multi-user.target.wants/dbus.service
+OPTS+=" --disable-static               \
+        --enable-checks                \
+        --with-xml=expat               \
+        --localstatedir=/var           \
+        --disable-dnotify              \
+        --with-session-socket-dir=/tmp \
+        --with-dbus-user=messagebus    \
+        --disable-xml-docs             \
+        --with-init-scripts=none       \
+        --disable-verbose-mode         \
+        --with-system-pid-file=/var/run/messagebus.pid"
 
-  if kernel_option_present CONFIG_INOTIFY_USER ; then
-    OPTS+=" --enable-inotify"
-  else
-    OPTS+=" --disable-inotify"
-  fi  &&
+if module_installed systemd; then
+  OPTS+=" --with-systemdsystemunitdir=/usr/lib/systemd/system \
+          --enable-systemd"
+fi
 
-  OPTS+=" --disable-static               \
-          --enable-checks                \
-          --with-xml=expat               \
-          --localstatedir=/var           \
-          --disable-dnotify              \
-          --with-session-socket-dir=/tmp \
-          --with-dbus-user=messagebus    \
-          --disable-xml-docs             \
-          --with-init-scripts=none       \
-          --disable-verbose-mode         \
-          --with-system-pid-file=/var/run/messagebus.pid"
+default_build  &&
 
-  default_build  &&
+# The following used to be in POST_INSTALL but the service wasn't starting
+# on FIRST install due to the lack of existing /var/lib/dbus
+add_priv_user messagebus:messagebus -d /dev/null -s /bin/false  &&
+mkdir -p /var/run/dbus  &&
+chown -R messagebus:messagebus /var/run/dbus  &&
 
-  # The following used to be in POST_INSTALL but the service wasn't starting
-  # on FIRST install due to the lack of existing /var/lib/dbus
-  add_priv_user messagebus:messagebus -d /dev/null -s /bin/false  &&
-  mkdir -p /var/run/dbus  &&
-  chown -R messagebus:messagebus /var/run/dbus  &&
-
-  mkdir -p /etc/X11/xinit/xinitrc.d/  &&
-  install -m755 $SCRIPT_DIRECTORY/30-dbus /etc/X11/xinit/xinitrc.d/
-
-) > $C_FIFO 2>&1
+mkdir -p /etc/X11/xinit/xinitrc.d/  &&
+install -m755 $SCRIPT_DIRECTORY/30-dbus /etc/X11/xinit/xinitrc.d/