summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-05-14 13:59:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-22 13:09:02 +0100
commita75114195b7a49a1e76099cc09b941f6247d8a46 (patch)
tree91230b7ca7fe2cc7441308fd76a902709227b57d
parentd4dea76fbe9765d489e3e522a9d2c22049610c7b (diff)
downloadopenembedded-core-a75114195b7a49a1e76099cc09b941f6247d8a46.tar.gz
openembedded-core-a75114195b7a49a1e76099cc09b941f6247d8a46.tar.bz2
openembedded-core-a75114195b7a49a1e76099cc09b941f6247d8a46.zip
dbus: upgrade to 1.12.8
Remove instrospection related tweaks as dbus-glib no longer needs this xml file. Remove the installation of session.conf. This file is installed into recipe-sysroot-native directory, which makes no sense. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/dbus/dbus_1.12.8.bb (renamed from meta/recipes-core/dbus/dbus_1.12.2.bb)12
1 files changed, 2 insertions, 10 deletions
diff --git a/meta/recipes-core/dbus/dbus_1.12.2.bb b/meta/recipes-core/dbus/dbus_1.12.8.bb
index fb5b69aa47..b3ddaafab5 100644
--- a/meta/recipes-core/dbus/dbus_1.12.2.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.8.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] = "3361456cadb99aa6601bed5b48964254"
-SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88"
+SRC_URI[md5sum] = "2764bf150e5aa8005b7bc0d6c388756a"
+SRC_URI[sha256sum] = "e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3"
inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
@@ -153,14 +153,6 @@ do_install() {
do_install_class-native() {
autotools_do_install
- # for dbus-glib-native introspection generation
- install -d ${D}${STAGING_DATADIR_NATIVE}/dbus/
- # N.B. is below install actually required?
- install -m 0644 bus/session.conf ${D}${STAGING_DATADIR_NATIVE}/dbus/session.conf
-
- # dbus-glib-native and dbus-glib need this xml file
- ./bus/dbus-daemon --introspect > ${D}${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
-
# dbus-launch has no X support so lets not install it in case the host
# has a more featured and useful version
rm -f ${D}${bindir}/dbus-launch