diff options
Diffstat (limited to 'meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch')
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch b/meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch new file mode 100644 index 0000000000..9cca38ddc8 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch @@ -0,0 +1,48 @@ +Index: dbus-1.3.1/configure.in +=================================================================== +--- dbus-1.3.1.orig/configure.in ++++ dbus-1.3.1/configure.in +@@ -137,6 +137,7 @@ + AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) + AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)])) + AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) ++AC_ARG_WITH(dbus_default_reply_timeout, AS_HELP_STRING([--with-dbus-default-reply-timeout=[milliseconds]],[Default reply timeout for DBus method calls])) + + dnl DBUS_BUILD_TESTS controls unit tests built in to .c files + dnl and also some stuff in the test/ subdir +@@ -984,6 +985,13 @@ + fi + fi + ++if test -z "$with_dbus_default_reply_timeout" ; then ++ DBUS_DEFAULT_REPLY_TIMEOUT=25000 ++else ++ DBUS_DEFAULT_REPLY_TIMEOUT=$with_dbus_default_reply_timeout ++fi ++AC_DEFINE_UNQUOTED(_DBUS_DEFAULT_TIMEOUT_VALUE,$DBUS_DEFAULT_REPLY_TIMEOUT,[default timeout value for dbus calls]) ++ + #### Set up final flags + DBUS_CLIENT_CFLAGS= + DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_libs" +@@ -1625,6 +1633,7 @@ + Gettext libs (empty OK): ${INTLLIBS} + Using XML parser: ${with_xml} + Init scripts style: ${with_init_scripts} ++ Default reply timeout: ${DBUS_DEFAULT_REPLY_TIMEOUT} + Abstract socket names: ${ac_cv_have_abstract_sockets} + System bus socket: ${DBUS_SYSTEM_SOCKET} + System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} +Index: dbus-1.3.1/dbus/dbus-connection-internal.h +=================================================================== +--- dbus-1.3.1.orig/dbus/dbus-connection-internal.h ++++ dbus-1.3.1/dbus/dbus-connection-internal.h +@@ -41,9 +41,6 @@ + DBUS_ITERATION_BLOCK = 1 << 2 /**< Block if nothing to do. */ + } DBusIterationFlags; + +-/** default timeout value when waiting for a message reply, 25 seconds */ +-#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000) +- + void _dbus_connection_lock (DBusConnection *connection); + void _dbus_connection_unlock (DBusConnection *connection); + DBusConnection * _dbus_connection_ref_unlocked (DBusConnection *connection); |