diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2016-01-14 17:16:23 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-29 18:14:53 +0000 |
| commit | 3cd34c673d2f64e310b474036754e1ead5775d66 (patch) | |
| tree | 21d86db32239cf30ed56fd9026568cc9012bd310 /meta/recipes-core/dbus/dbus | |
| parent | a5e931e0b1d941cc938fe2f49625c54b07fab0ce (diff) | |
| download | openembedded-core-contrib-3cd34c673d2f64e310b474036754e1ead5775d66.tar.gz | |
dbus: upgrade to 1.10.6
Now that systemd doesn't use DBus directly, dbus can --enable-systemd. In fact
this appears to be essential for DBus to work on under modern systemd.
python-config.patch refreshed.
Package dbus-test-tool into PN-dev, and remove obsolete dbus-glib-tool
reference.
Remove obsolete --without-dbus-glib option, and dependency on dbus-glib in
dbus-test.
[ patch originally by Chen, tweaked and message rewritten by RB ]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/dbus/dbus')
| -rw-r--r-- | meta/recipes-core/dbus/dbus/python-config.patch | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch index 294400247e..da2f10c726 100644 --- a/meta/recipes-core/dbus/dbus/python-config.patch +++ b/meta/recipes-core/dbus/dbus/python-config.patch @@ -7,19 +7,28 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> ---- dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 -+++ dbus-1.6.8/configure.ac 2013-07-11 14:14:40.969554848 -0500 -@@ -257,13 +257,6 @@ +--- + configure.ac | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 80d27b4..becc1cc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -279,13 +279,6 @@ if test "x$enable_tests" = xyes; then # full test coverage is required, Python is a hard dependency - AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) + AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygi]) AM_PATH_PYTHON([2.6]) - AC_MSG_CHECKING([for Python modules for full test coverage]) -- if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then +- if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) +- AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, dbus.mainloop.glib Python modules]) - fi else # --enable-tests not given: do not abort if Python is missing AM_PATH_PYTHON([2.6], [], [:]) +-- +1.9.1 + |