diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2018-05-14 13:59:23 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-22 13:13:32 +0100 |
| commit | f920cf02f87280bc1f96a2c9a2d3562b1f57a19f (patch) | |
| tree | 4d0557a25995927be638c43d71fd5f526f49c50c | |
| parent | 14a5089e812f9ae9e42a915ab92bdd792a3a04dc (diff) | |
| download | poky-f920cf02f87280bc1f96a2c9a2d3562b1f57a19f.tar.gz | |
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.
(From OE-Core rev: a75114195b7a49a1e76099cc09b941f6247d8a46)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 \ | |||
| 18 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | 18 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ |
| 19 | " | 19 | " |
| 20 | 20 | ||
| 21 | SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" | 21 | SRC_URI[md5sum] = "2764bf150e5aa8005b7bc0d6c388756a" |
| 22 | SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88" | 22 | SRC_URI[sha256sum] = "e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3" |
| 23 | 23 | ||
| 24 | inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even | 24 | inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even |
| 25 | 25 | ||
| @@ -153,14 +153,6 @@ do_install() { | |||
| 153 | do_install_class-native() { | 153 | do_install_class-native() { |
| 154 | autotools_do_install | 154 | autotools_do_install |
| 155 | 155 | ||
| 156 | # for dbus-glib-native introspection generation | ||
| 157 | install -d ${D}${STAGING_DATADIR_NATIVE}/dbus/ | ||
| 158 | # N.B. is below install actually required? | ||
| 159 | install -m 0644 bus/session.conf ${D}${STAGING_DATADIR_NATIVE}/dbus/session.conf | ||
| 160 | |||
| 161 | # dbus-glib-native and dbus-glib need this xml file | ||
| 162 | ./bus/dbus-daemon --introspect > ${D}${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml | ||
| 163 | |||
| 164 | # dbus-launch has no X support so lets not install it in case the host | 156 | # dbus-launch has no X support so lets not install it in case the host |
| 165 | # has a more featured and useful version | 157 | # has a more featured and useful version |
| 166 | rm -f ${D}${bindir}/dbus-launch | 158 | rm -f ${D}${bindir}/dbus-launch |
