diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-04-27 09:07:02 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-09 15:52:57 +0200 |
| commit | 9e1849c05c30d5f14fc33e4b331bc07f0a619d59 (patch) | |
| tree | 02d314f5e86ad71b593f51ae33ab6110504a86cf | |
| parent | 015683c407330bf189b77f8e15bb687aa5c3ac5a (diff) | |
| download | ptxdist-9e1849c05c30d5f14fc33e4b331bc07f0a619d59.tar.gz ptxdist-9e1849c05c30d5f14fc33e4b331bc07f0a619d59.tar.xz | |
dbus: install config files for systemd initmethod
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/dbus.in | 6 | ||||
| -rw-r--r-- | rules/dbus.make | 22 |
2 files changed, 26 insertions, 2 deletions
diff --git a/rules/dbus.in b/rules/dbus.in index aca0cb298..3002ee4a7 100644 --- a/rules/dbus.in +++ b/rules/dbus.in @@ -127,4 +127,10 @@ config DBUS_STARTSCRIPT default y prompt "install /etc/init.d/dbus" +config DBUS_SYSTEMD_UNIT + bool + default y + depends on SYSTEMD + prompt "install systemd unit files for dbus" + endif diff --git a/rules/dbus.make b/rules/dbus.make index fc5f4f390..5b32f8f61 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -63,8 +63,7 @@ DBUS_AUTOCONF := \ --disable-kqueue \ --disable-console-owner-file \ --disable-userdb-cache \ - --with-dbus-user=$(PTXCONF_DBUS_USER) \ - --with-systemdsystemunitdir=/usr/share/dbus-1/system-services + --with-dbus-user=$(PTXCONF_DBUS_USER) ifdef PTXCONF_DBUS_XML_EXPAT DBUS_AUTOCONF += --with-xml=expat @@ -85,6 +84,12 @@ else DBUS_AUTOCONF += --without-x endif +ifdef PTXCONF_DBUS_SYSTEMD_UNIT +DBUS_AUTOCONF += --with-systemdsystemunitdir=/lib/systemd/system +else +DBUS_AUTOCONF += --without-systemdsystemunitdir +endif + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -161,6 +166,19 @@ ifneq ($(call remove_quotes,$(PTXCONF_DBUS_BBINIT_LINK)),) endif endif endif +ifdef PTXCONF_DBUS_SYSTEMD_UNIT + @$(call install_copy, dbus, 0, 0, 0644, -, \ + /lib/systemd/system/dbus.socket) + @$(call install_link, dbus, ../dbus.socket, \ + /lib/systemd/system/sockets.target.wants/dbus.socket) + @$(call install_link, dbus, ../dbus.socket, \ + /lib/systemd/system/dbus.target.wants/dbus.socket) + + @$(call install_copy, dbus, 0, 0, 0644, -, \ + /lib/systemd/system/dbus.service) + @$(call install_link, dbus, ../dbus.service, \ + /lib/systemd/system/multi-user.target.wants/dbus.service) +endif ifdef PTXCONF_INITMETHOD_UPSTART ifdef PTXCONF_DBUS_STARTSCRIPT |