[oe-commits] Koen Kooi : dbus: update to 1.4.12
git version control
git at git.openembedded.org
Thu Jun 30 19:59:06 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 2c12ae905db6168439dacd18294dea839da28ef3
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2c12ae905db6168439dacd18294dea839da28ef3
Author: Koen Kooi <koen at dominion.thruhere.net>
Date: Thu Jun 23 13:56:48 2011 +0200
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)
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch | 36 ----------------
.../dbus/{dbus-1.4.1 => dbus-1.4.12}/dbus-1.init | 0
meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch | 44 ++++++++++++++++++++
meta/recipes-core/dbus/dbus_1.4.1.bb | 6 ---
meta/recipes-core/dbus/dbus_1.4.12.bb | 4 ++
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 @@
-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 at 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"
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
similarity index 100%
rename from meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init
rename to 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 @@
+From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen at 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 at 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 at 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
+
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 @@
-include dbus.inc
-
-PR = "r6"
-
-SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
-SRC_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 @@
+include dbus.inc
+SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
+SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"
+
More information about the Openembedded-commits
mailing list