diff options
Diffstat (limited to 'meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch')
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch b/meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch deleted file mode 100644 index a38e3db0d..000000000 --- a/meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | From fb546488e93a1638d377b228bbb0d2ab58462168 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Willmann <daniel@totalueberwachung.de> | ||
3 | Date: Thu, 2 Oct 2008 15:50:17 +0800 | ||
4 | Subject: [PATCH] Make the default DBus reply timeout configurable | ||
5 | |||
6 | This patch adds an option --with-dbus-default-reply-timeout to configure | ||
7 | that will set the default reply timeout used by libdbus in milliseconds. | ||
8 | autoconf and autoheader need to be rerun in order to regenerate the | ||
9 | correct configure and config.h.in files. | ||
10 | --- | ||
11 | configure.in | 9 +++++++++ | ||
12 | dbus/dbus-connection-internal.h | 3 --- | ||
13 | dbus/dbus-pending-call.c | 1 + | ||
14 | 3 files changed, 10 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/configure.in b/configure.in | ||
17 | index 62ac387..5c912d7 100644 | ||
18 | --- a/configure.in | ||
19 | +++ b/configure.in | ||
20 | @@ -88,6 +88,7 @@ AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]] | ||
21 | AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) | ||
22 | AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)])) | ||
23 | AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) | ||
24 | +AC_ARG_WITH(dbus_default_reply_timeout, AS_HELP_STRING([--with-dbus-default-reply-timeout=[milliseconds]],[Default reply timeout for DBus method calls])) | ||
25 | |||
26 | AC_DEFINE(DBUS_UNIX,1,[dbus on unix]) | ||
27 | |||
28 | @@ -986,6 +987,13 @@ if test x$have_libaudit = xyes ; then | ||
29 | AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support]) | ||
30 | fi | ||
31 | |||
32 | +if test -z "$with_dbus_default_reply_timeout" ; then | ||
33 | + DBUS_DEFAULT_REPLY_TIMEOUT=25000 | ||
34 | +else | ||
35 | + DBUS_DEFAULT_REPLY_TIMEOUT=$with_dbus_default_reply_timeout | ||
36 | +fi | ||
37 | +AC_DEFINE_UNQUOTED(_DBUS_DEFAULT_TIMEOUT_VALUE,$DBUS_DEFAULT_REPLY_TIMEOUT,[default timeout value for dbus calls]) | ||
38 | + | ||
39 | #### Set up final flags | ||
40 | DBUS_CLIENT_CFLAGS= | ||
41 | DBUS_CLIENT_LIBS="$THREAD_LIBS" | ||
42 | @@ -1348,6 +1356,7 @@ echo " | ||
43 | Gettext libs (empty OK): ${INTLLIBS} | ||
44 | Using XML parser: ${with_xml} | ||
45 | Init scripts style: ${with_init_scripts} | ||
46 | + Default reply timeout: ${DBUS_DEFAULT_REPLY_TIMEOUT} | ||
47 | Abstract socket names: ${ac_cv_have_abstract_sockets} | ||
48 | System bus socket: ${DBUS_SYSTEM_SOCKET} | ||
49 | System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} | ||
50 | diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h | ||
51 | index df54412..5fe536b 100644 | ||
52 | --- a/dbus/dbus-connection-internal.h | ||
53 | +++ b/dbus/dbus-connection-internal.h | ||
54 | @@ -41,9 +41,6 @@ typedef enum | ||
55 | DBUS_ITERATION_BLOCK = 1 << 2 /**< Block if nothing to do. */ | ||
56 | } DBusIterationFlags; | ||
57 | |||
58 | -/** default timeout value when waiting for a message reply, 25 seconds */ | ||
59 | -#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000) | ||
60 | - | ||
61 | void _dbus_connection_lock (DBusConnection *connection); | ||
62 | void _dbus_connection_unlock (DBusConnection *connection); | ||
63 | DBusConnection * _dbus_connection_ref_unlocked (DBusConnection *connection); | ||
64 | diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c | ||
65 | index 51b9378..5a7a5f4 100644 | ||
66 | --- a/dbus/dbus-pending-call.c | ||
67 | +++ b/dbus/dbus-pending-call.c | ||
68 | @@ -21,6 +21,7 @@ | ||
69 | * | ||
70 | */ | ||
71 | |||
72 | +#include <config.h> | ||
73 | #include "dbus-internals.h" | ||
74 | #include "dbus-connection-internal.h" | ||
75 | #include "dbus-pending-call-internal.h" | ||
76 | -- | ||
77 | 1.5.6.4 | ||
78 | |||