Skip to contentSkip to conversation

dbus: upgrade to 1.10.2

PATCH In review Ed Bartosh 2 participants 4 messages Oct 31, 2015 – Nov 1, 2015

lore
Share & tools
lore

Ed Bartosh

author
#0 lore raw

PATCH 1/1 dbus: upgrade to 1.10.2

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]

---
 .../{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
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +2 -2
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
@@ -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:"
meta/recipes-core/dbus/dbus.inc +4 -2
index 3971081..bfb7bee 100644
@@ -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"
 
meta/recipes-core/dbus/dbus/python-config.patch +6 -15
index 2944002..c8393e5 100644
@@ -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
meta/recipes-core/dbus/dbus_1.10.2.bb new file +4 -0
new file mode 100644
index 0000000..03a7877
@@ -0,0 +1,4 @@
+include dbus.inc
+
+SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31"
+SRC_URI[sha256sum] = "aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"
meta/recipes-core/dbus/dbus_1.8.20.bb deleted +0 -4
deleted file mode 100644
index a8f2094..0000000
@@ -1,4 +0,0 @@
-include dbus.inc
-
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"
Signature · 1 line
2.1.4
#1 lore raw
Quoted 2 lines · Ed Bartosh

This upgrade should fix qemu build failure on Ubuntu 1.5.10

Typo

Quoted 6 lines

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'

It's a Dbus ABI issue. It is better to have pulseaudio-native to solve the underlying issue. Upgrade while fine in itself is really hiding the underlying issue

Quoted 8 lines

[YOCTO #8553]

---
 .../{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

++++++---------------

Quoted 4 lines
 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%)

Review

Quoted 4 lines
 create mode 100644 meta/recipes-core/dbus/dbus_1.10.2.bb
 delete mode 100644 meta/recipes-core/dbus/dbus_1.8.20.bb
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus-test_1.10.2.bb

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = "

Quoted 7 lines

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

meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -0
@@ -18,8 +18,8 @@ SRC_URI = "

http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \

Quoted 5 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -2
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
            "
 
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] =

"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = " · line 22

Quoted 2 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +2 -0
+SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31"
+SRC_URI[sha256sum] =

"aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"

Review

Quoted 4 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -0
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus.inc

Review

Quoted 27 lines

index 3971081..bfb7bee 100644

meta/recipes-core/dbus/dbus.inc +4 -2
@@ -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"
 
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus/python-config.patch

meta/recipes-core/dbus/dbus/python-config.patch line 2

Quoted 6 lines

index 2944002..c8393e5 100644

meta/recipes-core/dbus/dbus/python-config.patch +0 -2
@@ -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.

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 8 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -8
-
-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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 3 lines
meta/recipes-core/dbus/dbus/python-config.patch +1 -2
-+++ 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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +2 -1
++++ 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])

meta/recipes-core/dbus/dbus/python-config.patch line 5

Quoted 1 line
meta/recipes-core/dbus/dbus/python-config.patch +1 -0
+   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires

Python, dbus-python, pygi])

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +1 -1
    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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -1
 -    AC_MSG_RESULT([yes])
 -  else
 -    AC_MSG_RESULT([no])
--    AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib

Python modules])

meta/recipes-core/dbus/dbus/python-config.patch line 12

Quoted 1 line
meta/recipes-core/dbus/dbus/python-config.patch +1 -0
+-    AC_MSG_ERROR([cannot import dbus, gi.repository.GObject,

dbus.mainloop.glib Python modules])

Review

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -0
 -  fi
  else
    # --enable-tests not given: do not abort if Python is missing
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus_1.10.2.bb

meta/recipes-core/dbus/dbus_1.10.2.bb line 4

Quoted 9 lines

new file mode 100644
index 0000000..03a7877

meta/recipes-core/dbus/dbus_1.10.2.bb new file +4 -0
@@ -0,0 +1,4 @@
+include dbus.inc
+
+SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31"
+SRC_URI[sha256sum] =

"aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus_1.8.20.bb

meta/recipes-core/dbus/dbus_1.8.20.bb line 4

Quoted 9 lines

deleted file mode 100644
index a8f2094..0000000

meta/recipes-core/dbus/dbus_1.8.20.bb deleted +0 -4
@@ -1,4 +0,0 @@
-include dbus.inc
-
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] =

"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"

Quoted 8 lines

--
2.1.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#2 lore raw
Quoted 5 lines · Khem Raj
Quoted 2 lines · Ed Bartosh

This upgrade should fix qemu build failure on Ubuntu 1.5.10

Typo

Thanks. I'll fix it in v2.

Quoted 11 lines
Quoted 7 lines

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'

It's a Dbus ABI issue. It is better to have pulseaudio-native to solve the underlying issue. Upgrade while fine in itself is really hiding the underlying issue

Exactly my opinion. The reason of this is caused by the way qemu is built in oe. It's linked with host sdl, which is potential cause for all kinds of similar issues. You can see more details in the bug #8553.

However, considering that we're about to release 2.0 I'd suggest to accept this change as we just don't have time and ideas how to fix it properly.

Regards,
Ed

Quoted 143 lines
Quoted 8 lines

[YOCTO #8553]

---
 .../{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

++++++---------------

Quoted 4 lines
 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%)

Review

Quoted 4 lines
 create mode 100644 meta/recipes-core/dbus/dbus_1.10.2.bb
 delete mode 100644 meta/recipes-core/dbus/dbus_1.8.20.bb
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus-test_1.10.2.bb

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = "

Quoted 7 lines

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

meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -0
@@ -18,8 +18,8 @@ SRC_URI = "

http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \

Quoted 5 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -2
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
            "
 
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] =

"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = " · line 22

Quoted 2 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +2 -0
+SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31"
+SRC_URI[sha256sum] =

"aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"

Review

Quoted 4 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -0
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus.inc

Review

Quoted 27 lines

index 3971081..bfb7bee 100644

meta/recipes-core/dbus/dbus.inc +4 -2
@@ -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"
 
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus/python-config.patch

meta/recipes-core/dbus/dbus/python-config.patch line 2

Quoted 6 lines

index 2944002..c8393e5 100644

meta/recipes-core/dbus/dbus/python-config.patch +0 -2
@@ -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.

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 8 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -8
-
-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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 3 lines
meta/recipes-core/dbus/dbus/python-config.patch +1 -2
-+++ 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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +2 -1
++++ 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])

meta/recipes-core/dbus/dbus/python-config.patch line 5

Quoted 1 line
meta/recipes-core/dbus/dbus/python-config.patch +1 -0
+   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires

Python, dbus-python, pygi])

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +1 -1
    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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -1
 -    AC_MSG_RESULT([yes])
 -  else
 -    AC_MSG_RESULT([no])
--    AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib

Python modules])

meta/recipes-core/dbus/dbus/python-config.patch line 12

Quoted 1 line
meta/recipes-core/dbus/dbus/python-config.patch +1 -0
+-    AC_MSG_ERROR([cannot import dbus, gi.repository.GObject,

dbus.mainloop.glib Python modules])

Review

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -0
 -  fi
  else
    # --enable-tests not given: do not abort if Python is missing
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus_1.10.2.bb

meta/recipes-core/dbus/dbus_1.10.2.bb line 4

Quoted 9 lines

new file mode 100644
index 0000000..03a7877

meta/recipes-core/dbus/dbus_1.10.2.bb new file +4 -0
@@ -0,0 +1,4 @@
+include dbus.inc
+
+SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31"
+SRC_URI[sha256sum] =

"aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus_1.8.20.bb

meta/recipes-core/dbus/dbus_1.8.20.bb line 4

Quoted 9 lines

deleted file mode 100644
index a8f2094..0000000

meta/recipes-core/dbus/dbus_1.8.20.bb deleted +0 -4
@@ -1,4 +0,0 @@
-include dbus.inc
-
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] =

"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"

Quoted 8 lines

--
2.1.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 3 lines
--
Regards,
Ed
#3 lore raw
Quoted 19 lines · Ed Bartosh
Quoted 5 lines · Khem Raj
Quoted 2 lines · Ed Bartosh

This upgrade should fix qemu build failure on Ubuntu 1.5.10

Typo

Thanks. I'll fix it in v2.

Quoted 11 lines
Quoted 7 lines

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'

It's a Dbus ABI issue. It is better to have pulseaudio-native to solve the underlying issue. Upgrade while fine in itself is really hiding the underlying issue

Quoted 7 lines

Exactly my opinion. The reason of this is caused by the way qemu is built in oe. It's linked with host sdl, which is potential cause for all kinds of similar issues. You can see more details in the bug #8553.

However, considering that we're about to release 2.0 I'd suggest to accept this change as we just don't have time and ideas how to fix it properly.

dbus is a core library, While I would like to have 1.10 upgrade, it will need some serious testing
for which there might not be enough cycles left in this release cycle and it has potential to destabilize the release
and is against the policies that are set for package upgrades. On top dbus changes APIs and ABIs between major releases e.g. 1.8, 1.10 and so on. So I would
suggest to try alternate fix would be much better. Secondly you could do some analysis between
1.8 and 1.10 how the consumers might be affected. I dont think this patch should go in without
detailed look and analysis.

Quoted 152 lines

Regards,
Ed

Quoted 125 lines
Quoted 8 lines

[YOCTO #8553]

---
 .../{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

++++++---------------

Quoted 4 lines
 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%)

Review

Quoted 4 lines
 create mode 100644 meta/recipes-core/dbus/dbus_1.10.2.bb
 delete mode 100644 meta/recipes-core/dbus/dbus_1.8.20.bb
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus-test_1.10.2.bb

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = "

Quoted 7 lines

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

meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -0
@@ -18,8 +18,8 @@ SRC_URI = "

http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \

Quoted 5 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -2
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
            "
 
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] =

"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"

meta/recipes-core/dbus/dbus-test_1.10.2.bb SRC_URI = " · line 22

Quoted 2 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +2 -0
+SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31"
+SRC_URI[sha256sum] =

"aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"

Review

Quoted 4 lines
meta/recipes-core/dbus/dbus-test_1.10.2.bb renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb +0 -0
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus.inc

Review

Quoted 27 lines

index 3971081..bfb7bee 100644

meta/recipes-core/dbus/dbus.inc +4 -2
@@ -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"
 
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus/python-config.patch

meta/recipes-core/dbus/dbus/python-config.patch line 2

Quoted 6 lines

index 2944002..c8393e5 100644

meta/recipes-core/dbus/dbus/python-config.patch +0 -2
@@ -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.

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 8 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -8
-
-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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 3 lines
meta/recipes-core/dbus/dbus/python-config.patch +1 -2
-+++ 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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +2 -1
++++ 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])

meta/recipes-core/dbus/dbus/python-config.patch line 5

Quoted 1 line
meta/recipes-core/dbus/dbus/python-config.patch +1 -0
+   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires

Python, dbus-python, pygi])

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +1 -1
    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

meta/recipes-core/dbus/dbus/python-config.patch

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -1
 -    AC_MSG_RESULT([yes])
 -  else
 -    AC_MSG_RESULT([no])
--    AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib

Python modules])

meta/recipes-core/dbus/dbus/python-config.patch line 12

Quoted 1 line
meta/recipes-core/dbus/dbus/python-config.patch +1 -0
+-    AC_MSG_ERROR([cannot import dbus, gi.repository.GObject,

dbus.mainloop.glib Python modules])

Review

Quoted 4 lines
meta/recipes-core/dbus/dbus/python-config.patch +0 -0
 -  fi
  else
    # --enable-tests not given: do not abort if Python is missing
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus_1.10.2.bb

meta/recipes-core/dbus/dbus_1.10.2.bb line 4

Quoted 9 lines

new file mode 100644
index 0000000..03a7877

meta/recipes-core/dbus/dbus_1.10.2.bb new file +4 -0
@@ -0,0 +1,4 @@
+include dbus.inc
+
+SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31"
+SRC_URI[sha256sum] =

"aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-core/dbus/dbus_1.8.20.bb

Quoted 18 lines

meta/recipes-core/dbus/dbus_1.8.20.bb line 4

Quoted 9 lines

deleted file mode 100644
index a8f2094..0000000

meta/recipes-core/dbus/dbus_1.8.20.bb deleted +0 -4
@@ -1,4 +0,0 @@
-include dbus.inc
-
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] =

"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"

Quoted 8 lines

--
2.1.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
--
Regards,
Ed