This upgrade should fix qemu build failure on Ubuntu 1.5.10 caused by system pulseaudio requirement for newer libdbus.
qemu-native build with old dbus breaks on configure step with a lot of errors similar to this: libpulsecommon-6.0.so: undefined reference to `dbus_watch_get_enabled@LIBDBUS_1_3' [YOCTO #8553] Signed-off-by: Ed Bartosh <[email protected]> --- .../{dbus-test_1.8.20.bb => dbus-test_1.10.2.bb} | 4 ++-- meta/recipes-core/dbus/dbus.inc | 6 ++++-- meta/recipes-core/dbus/dbus/python-config.patch | 21 ++++++--------------- meta/recipes-core/dbus/dbus_1.10.2.bb | 4 ++++ meta/recipes-core/dbus/dbus_1.8.20.bb | 4 ---- 5 files changed, 16 insertions(+), 23 deletions(-) rename meta/recipes-core/dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.2.bb} (93%) create mode 100644 meta/recipes-core/dbus/dbus_1.10.2.bb delete mode 100644 meta/recipes-core/dbus/dbus_1.8.20.bb diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/meta/recipes-core/dbus/dbus-test_1.10.2.bb similarity index 93% rename from meta/recipes-core/dbus/dbus-test_1.8.20.bb rename to meta/recipes-core/dbus/dbus-test_1.10.2.bb index 704070b..1e05f54 100644 --- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb +++ b/meta/recipes-core/dbus/dbus-test_1.10.2.bb @@ -18,8 +18,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" -SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" +SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31" +SRC_URI[sha256sum] = "aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 3971081..bfb7bee 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -55,9 +55,12 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-monitor \ ${bindir}/dbus-launch \ ${bindir}/dbus-run-session \ + ${bindir}/dbus-test-tool \ + ${bindir}/dbus-update-activation-environment \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \ + ${datadir}/dbus-1 \ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ ${systemd_unitdir}/system/" @@ -83,8 +86,7 @@ EXTRA_OECONF = "--disable-tests \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ - --disable-systemd \ - --without-dbus-glib" + --disable-systemd" EXTRA_OECONF_append_class-native = " --disable-selinux" diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch index 2944002..c8393e5 100644 --- a/meta/recipes-core/dbus/dbus/python-config.patch +++ b/meta/recipes-core/dbus/dbus/python-config.patch @@ -1,24 +1,15 @@ -When building the dbus-ptest package, we have to enable python. However -checking if the host-system python has the necessary library isn't useful. - -Disable the python module check for cross compiling. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Mark Hatle <[email protected]> - ---- 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 @@ +--- dbus-1.10.2/configure.ac.orig 2015-10-31 21:19:38.046633745 +0200 ++++ dbus-1.10.2/configure.ac 2015-10-31 21:38:57.080231733 +0200 +@@ -279,13 +279,6 @@ # 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 diff --git a/meta/recipes-core/dbus/dbus_1.10.2.bb b/meta/recipes-core/dbus/dbus_1.10.2.bb new file mode 100644 index 0000000..03a7877 --- /dev/null +++ b/meta/recipes-core/dbus/dbus_1.10.2.bb @@ -0,0 +1,4 @@ +include dbus.inc + +SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31" +SRC_URI[sha256sum] = "aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e" diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.8.20.bb deleted file mode 100644 index a8f2094..0000000 --- a/meta/recipes-core/dbus/dbus_1.8.20.bb +++ /dev/null @@ -1,4 +0,0 @@ -include dbus.inc - -SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" -SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
