summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-01-14 17:16:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-30 11:37:00 +0000
commita16e9a2f0e2d0dfd8446e0dfd78f35bcab863619 (patch)
tree7f3c83c877dadf9514beb6e6b47a1224322ce489 /meta
parent70814586bb11c8f1aeb4c991f44cd52542159a91 (diff)
downloadpoky-a16e9a2f0e2d0dfd8446e0dfd78f35bcab863619.tar.gz
dbus: upgrade to 1.10.6
Now that systemd doesn't use DBus directly, dbus can --enable-systemd. In fact this appears to be essential for DBus to work on under modern systemd. python-config.patch refreshed. Package dbus-test-tool into PN-dev, and remove obsolete dbus-glib-tool reference. Remove obsolete --without-dbus-glib option, and dependency on dbus-glib in dbus-test. [ patch originally by Chen, tweaked and message rewritten by RB ] (From OE-Core rev: 3cd34c673d2f64e310b474036754e1ead5775d66) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/dbus/dbus-test_1.10.6.bb (renamed from meta/recipes-core/dbus/dbus-test_1.8.20.bb)6
-rw-r--r--meta/recipes-core/dbus/dbus/python-config.patch21
-rw-r--r--meta/recipes-core/dbus/dbus_1.10.6.bb (renamed from meta/recipes-core/dbus/dbus_1.8.20.bb)18
3 files changed, 28 insertions, 17 deletions
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/meta/recipes-core/dbus/dbus-test_1.10.6.bb
index f5400a0f26..a768a09c4a 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.10.6.bb
@@ -5,7 +5,7 @@ LICENSE = "AFL-2 | GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
6 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" 6 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
7 7
8DEPENDS = "python-pygobject dbus dbus-glib" 8DEPENDS = "python-pygobject dbus"
9 9
10RDEPENDS_${PN} += "make" 10RDEPENDS_${PN} += "make"
11RDEPENDS_${PN}-dev = "" 11RDEPENDS_${PN}-dev = ""
@@ -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
21SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" 21SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440"
22SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" 22SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f"
23 23
24S="${WORKDIR}/dbus-${PV}" 24S="${WORKDIR}/dbus-${PV}"
25FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" 25FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch
index 294400247e..da2f10c726 100644
--- a/meta/recipes-core/dbus/dbus/python-config.patch
+++ b/meta/recipes-core/dbus/dbus/python-config.patch
@@ -7,19 +7,28 @@ Upstream-Status: Inappropriate [oe specific]
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
10--- dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 10---
11+++ dbus-1.6.8/configure.ac 2013-07-11 14:14:40.969554848 -0500 11 configure.ac | 7 -------
12@@ -257,13 +257,6 @@ 12 1 file changed, 7 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 80d27b4..becc1cc 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -279,13 +279,6 @@ if test "x$enable_tests" = xyes; then
13 # full test coverage is required, Python is a hard dependency 19 # full test coverage is required, Python is a hard dependency
14 AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) 20 AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygi])
15 AM_PATH_PYTHON([2.6]) 21 AM_PATH_PYTHON([2.6])
16- AC_MSG_CHECKING([for Python modules for full test coverage]) 22- AC_MSG_CHECKING([for Python modules for full test coverage])
17- if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then 23- if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; then
18- AC_MSG_RESULT([yes]) 24- AC_MSG_RESULT([yes])
19- else 25- else
20- AC_MSG_RESULT([no]) 26- AC_MSG_RESULT([no])
21- AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) 27- AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, dbus.mainloop.glib Python modules])
22- fi 28- fi
23 else 29 else
24 # --enable-tests not given: do not abort if Python is missing 30 # --enable-tests not given: do not abort if Python is missing
25 AM_PATH_PYTHON([2.6], [], [:]) 31 AM_PATH_PYTHON([2.6], [], [:])
32--
331.9.1
34
diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.10.6.bb
index 0c7f6b1a21..5ba3f21242 100644
--- a/meta/recipes-core/dbus/dbus_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.6.bb
@@ -20,8 +20,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
20 file://0001-configure.ac-support-large-file-for-stat64.patch \ 20 file://0001-configure.ac-support-large-file-for-stat64.patch \
21" 21"
22 22
23SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" 23SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440"
24SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" 24SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f"
25 25
26inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even 26inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
27 27
@@ -59,15 +59,20 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
59 ${bindir}/dbus-monitor \ 59 ${bindir}/dbus-monitor \
60 ${bindir}/dbus-launch \ 60 ${bindir}/dbus-launch \
61 ${bindir}/dbus-run-session \ 61 ${bindir}/dbus-run-session \
62 ${bindir}/dbus-update-activation-environment \
62 ${libexecdir}/dbus* \ 63 ${libexecdir}/dbus* \
63 ${sysconfdir} \ 64 ${sysconfdir} \
64 ${localstatedir} \ 65 ${localstatedir} \
65 ${datadir}/dbus-1/services \ 66 ${datadir}/dbus-1/services \
66 ${datadir}/dbus-1/system-services \ 67 ${datadir}/dbus-1/system-services \
68 ${datadir}/dbus-1/session.d \
69 ${datadir}/dbus-1/session.conf \
70 ${datadir}/dbus-1/system.d \
71 ${datadir}/dbus-1/system.conf \
67 ${systemd_unitdir}/system/" 72 ${systemd_unitdir}/system/"
68FILES_${PN}-lib = "${libdir}/lib*.so.*" 73FILES_${PN}-lib = "${libdir}/lib*.so.*"
69RRECOMMENDS_${PN}-lib = "${PN}" 74RRECOMMENDS_${PN}-lib = "${PN}"
70FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" 75FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool"
71 76
72pkg_postinst_dbus() { 77pkg_postinst_dbus() {
73 # If both systemd and sysvinit are enabled, mask the dbus-1 init script 78 # If both systemd and sysvinit are enabled, mask the dbus-1 init script
@@ -87,8 +92,7 @@ EXTRA_OECONF = "--disable-tests \
87 --disable-xml-docs \ 92 --disable-xml-docs \
88 --disable-doxygen-docs \ 93 --disable-doxygen-docs \
89 --disable-libaudit \ 94 --disable-libaudit \
90 --disable-systemd \ 95 "
91 --without-dbus-glib"
92 96
93EXTRA_OECONF_append_class-native = " --disable-selinux" 97EXTRA_OECONF_append_class-native = " --disable-selinux"
94 98
@@ -98,9 +102,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd',
98PACKAGECONFIG_class-native = "" 102PACKAGECONFIG_class-native = ""
99PACKAGECONFIG_class-nativesdk = "" 103PACKAGECONFIG_class-nativesdk = ""
100 104
101# Would like to --enable-systemd but that's a circular build-dependency between 105PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd"
102# systemd<->dbus
103PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
104PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" 106PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
105PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," 107PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
106 108