summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-23 11:56:48 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-30 19:57:06 (GMT)
commitf830c94e75a539f78bbdd77b9a987eaad15c8424 (patch)
tree8bf6b7059d41e902934b25bbe3172a91c984f2a2
parent771f5d00c8fa1aec982ec3a2264cb369a3ee024e (diff)
downloadpoky-f830c94e75a539f78bbdd77b9a987eaad15c8424.tar.gz
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>
-rw-r--r--meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch36
-rw-r--r--meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init (renamed from meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init)0
-rw-r--r--meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch44
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.1.bb6
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.12.bb4
5 files changed, 48 insertions, 42 deletions
diff --git a/meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch
deleted file mode 100644
index de0766a..0000000
--- a/meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Upstream-Status: Inappropriate [embedded]
2
3# avoid to check tmp dir at build time. instead uses hard coded /tmp here
4#
5# comment added by Kevin Tian <kevin.tian@intel.com>
6
7--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
8+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
9@@ -1047,15 +1048,18 @@
10 AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
11
12 #### Find socket directories
13-if ! test -z "$TMPDIR" ; then
14- DEFAULT_SOCKET_DIR=$TMPDIR
15-elif ! test -z "$TEMP" ; then
16- DEFAULT_SOCKET_DIR=$TEMP
17-elif ! test -z "$TMP" ; then
18- DEFAULT_SOCKET_DIR=$TMP
19-else
20- DEFAULT_SOCKET_DIR=/tmp
21-fi
22+#if ! test -z "$TMPDIR" ; then
23+# DEFAULT_SOCKET_DIR=$TMPDIR
24+#elif ! test -z "$TEMP" ; then
25+# DEFAULT_SOCKET_DIR=$TEMP
26+#elif ! test -z "$TMP" ; then
27+# DEFAULT_SOCKET_DIR=$TMP
28+#else
29+# DEFAULT_SOCKET_DIR=/tmp
30+#fi
31+
32+# checks disabled to avoid expanding this at build time
33+DEFAULT_SOCKET_DIR=/tmp
34
35 if ! test -z "$with_test_socket_dir" ; then
36 TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init b/meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init
index 4abc4cb..4abc4cb 100644
--- a/meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init
diff --git a/meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch
new file mode 100644
index 0000000..bf086e1
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch
@@ -0,0 +1,44 @@
1From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Thu, 23 Jun 2011 13:52:09 +0200
4Subject: [PATCH] buildsys: hardcode socketdir to /tmp
5
6the TMPDIR env var isn't always pointing to the right target path
7
8Upstream-Status: Inappropriate [embedded]
9
10Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
11
12Original comment:
13
14 avoid to check tmp dir at build time. instead uses hard coded /tmp here
15 comment added by Kevin Tian <kevin.tian@intel.com>
16---
17 configure.ac | 11 +----------
18 1 files changed, 1 insertions(+), 10 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 408054b..6d26180 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY)
25 AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY",
26 [Full path to the launch helper test program in the builddir])
27
28-#### Find socket directories
29-if ! test -z "$TMPDIR" ; then
30- DEFAULT_SOCKET_DIR=$TMPDIR
31-elif ! test -z "$TEMP" ; then
32- DEFAULT_SOCKET_DIR=$TEMP
33-elif ! test -z "$TMP" ; then
34- DEFAULT_SOCKET_DIR=$TMP
35-else
36- DEFAULT_SOCKET_DIR=/tmp
37-fi
38+DEFAULT_SOCKET_DIR=/tmp
39
40 DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'`
41
42--
431.6.6.1
44
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
deleted file mode 100644
index 252d160..0000000
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1include dbus.inc
2
3PR = "r6"
4
5SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
6SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
diff --git a/meta/recipes-core/dbus/dbus_1.4.12.bb b/meta/recipes-core/dbus/dbus_1.4.12.bb
new file mode 100644
index 0000000..ada53c9
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus_1.4.12.bb
@@ -0,0 +1,4 @@
1include dbus.inc
2SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
3SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"
4