diff options
| author |   Chong Lu <Chong.Lu@windriver.com> | 2014-05-14 17:29:07 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-15 23:24:04 +0100 |
| commit | 596470547451084944082cbed50351ad0d912255 (patch) | |
| tree | 2cb2d74142281a3ddadc520f3bbb25ac00b0d371 /meta/recipes-core/dbus/dbus.inc | |
| parent | 0c16964c8f1c96066ab7254048bc5025dd7b4e59 (diff) | |
| download | openembedded-core-contrib-596470547451084944082cbed50351ad0d912255.tar.gz | |
dbus: Update to 1.8.2 version
Upgrade dbus to 1.8.2.
Modify ptest suite to make it enabled on new version.
If systemd in DISTRO_FEATURES, we expect to install dbus systemd
unit files.
Remove unneeded patches since it's included in new version.
Remove unrecognized option: "--with-xml"
[YOCTO #6092]
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dbus/dbus.inc')
| -rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 4510ae3e95..b3d3834dd0 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -17,8 +17,6 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://dbus-1.init \ file://os-test.patch \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ - file://Set-correct-address-when-using-address-systemd.patch \ - file://fixed-memory-freeing-if-error-during-listing-service.patch \ " inherit useradd autotools pkgconfig gettext update-rc.d @@ -56,6 +54,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-send \ ${bindir}/dbus-monitor \ ${bindir}/dbus-launch \ + ${bindir}/dbus-run-session \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \ @@ -84,7 +83,6 @@ EXTRA_OECONF = "--disable-tests \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ - --with-xml=expat \ --disable-systemd" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ @@ -106,6 +104,16 @@ do_install() { install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \ + install -d ${D}${systemd_unitdir}/system/$i; done + install ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/ + cd ${D}${systemd_unitdir}/system/dbus.target.wants/ + ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket + ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket + ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service + fi + install -d ${D}${sysconfdir}/default/volatiles echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ > ${D}${sysconfdir}/default/volatiles/99_dbus |