dbus: update to 1.4.12

The tmpdir patch has been regenerated and can now be applied with git-am, no functional changes.

The biggest improvement is that dbus will log to syslog nowadays:

[   22.238708] <29>dbus[237]: [system] Activating service name='fi.w1.wpa_supplicant1' (using servicehelper)

(From OE-Core rev: 2c12ae905db6168439dacd18294dea839da28ef3)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Koen Kooi 2011-06-23 13:56:48 +02:00 committed by Richard Purdie
parent 771f5d00c8
commit f830c94e75
5 changed files with 48 additions and 42 deletions

View File

@ -1,36 +0,0 @@
Upstream-Status: Inappropriate [embedded]
# avoid to check tmp dir at build time. instead uses hard coded /tmp here
#
# comment added by Kevin Tian <kevin.tian@intel.com>
--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
@@ -1047,15 +1048,18 @@
AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
#### Find socket directories
-if ! test -z "$TMPDIR" ; then
- DEFAULT_SOCKET_DIR=$TMPDIR
-elif ! test -z "$TEMP" ; then
- DEFAULT_SOCKET_DIR=$TEMP
-elif ! test -z "$TMP" ; then
- DEFAULT_SOCKET_DIR=$TMP
-else
- DEFAULT_SOCKET_DIR=/tmp
-fi
+#if ! test -z "$TMPDIR" ; then
+# DEFAULT_SOCKET_DIR=$TMPDIR
+#elif ! test -z "$TEMP" ; then
+# DEFAULT_SOCKET_DIR=$TEMP
+#elif ! test -z "$TMP" ; then
+# DEFAULT_SOCKET_DIR=$TMP
+#else
+# DEFAULT_SOCKET_DIR=/tmp
+#fi
+
+# checks disabled to avoid expanding this at build time
+DEFAULT_SOCKET_DIR=/tmp
if ! test -z "$with_test_socket_dir" ; then
TEST_SOCKET_DIR="$with_test_socket_dir"

View File

@ -0,0 +1,44 @@
From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 23 Jun 2011 13:52:09 +0200
Subject: [PATCH] buildsys: hardcode socketdir to /tmp
the TMPDIR env var isn't always pointing to the right target path
Upstream-Status: Inappropriate [embedded]
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Original comment:
avoid to check tmp dir at build time. instead uses hard coded /tmp here
comment added by Kevin Tian <kevin.tian@intel.com>
---
configure.ac | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 408054b..6d26180 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY)
AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY",
[Full path to the launch helper test program in the builddir])
-#### Find socket directories
-if ! test -z "$TMPDIR" ; then
- DEFAULT_SOCKET_DIR=$TMPDIR
-elif ! test -z "$TEMP" ; then
- DEFAULT_SOCKET_DIR=$TEMP
-elif ! test -z "$TMP" ; then
- DEFAULT_SOCKET_DIR=$TMP
-else
- DEFAULT_SOCKET_DIR=/tmp
-fi
+DEFAULT_SOCKET_DIR=/tmp
DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'`
--
1.6.6.1

View File

@ -1,6 +0,0 @@
include dbus.inc
PR = "r6"
SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"

View File

@ -0,0 +1,4 @@
include dbus.inc
SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"