diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-13 16:28:29 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-17 10:51:03 +0200 |
| commit | 1ca721a016063f04ff4edebac228cb1d26f87273 (patch) | |
| tree | 0ede29510c996f75edaa47876f2af030ddfe6ad0 /rules/dbus.in | |
| parent | 2a8dd02bb922484b6edbdc9bebb08b862a6e3fe5 (diff) | |
| download | ptxdist-1ca721a016063f04ff4edebac228cb1d26f87273.tar.gz ptxdist-1ca721a016063f04ff4edebac228cb1d26f87273.tar.xz | |
dbus: version bump 1.6.18 -> 1.8.4
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/dbus.in')
| -rw-r--r-- | rules/dbus.in | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/rules/dbus.in b/rules/dbus.in index 81550de6a..4c6b24695 100644 --- a/rules/dbus.in +++ b/rules/dbus.in @@ -3,10 +3,10 @@ menuconfig DBUS tristate prompt "dbus " - select EXPAT if DBUS_XML_EXPAT - select LIBXML2 if DBUS_XML_LIBXML2 + select EXPAT select XORG_LIB_X11 if DBUS_X select MACHINE_ID if RUNTIME + select SYSTEMD if DBUS_SYSTEMD select LIBC_PTHREAD select LIBC_RT help @@ -31,28 +31,9 @@ config DBUS_SELINUX depends on BROKEN bool -choice - prompt "xml library " - default DBUS_XML_EXPAT - - config DBUS_XML_EXPAT - bool - prompt "expat " - - config DBUS_XML_LIBXML2 - bool - prompt "libxml2" -endchoice - -config DBUS_USER - string - prompt "user for running the dbus daemon" - default "messagebus" - help - Enter the user name to run the D-Bus daemon with. The PTXdist - standard configuration has only root, so if you want to use - the dbus default user "messagebus" you have to create a - related user yourself. +config DBUS_SYSTEMD + bool + default INITMETHOD_SYSTEMD config DBUS_X bool |