diff options
Diffstat (limited to 'yocto-poky/meta/recipes-core/dbus')
| -rw-r--r-- | yocto-poky/meta/recipes-core/dbus/dbus-glib.inc | 10 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/dbus/dbus-glib_0.104.bb | 4 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/dbus/dbus-glib_0.106.bb | 4 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/dbus/dbus-test_1.10.6.bb (renamed from yocto-poky/meta/recipes-core/dbus/dbus-test_1.8.20.bb) | 8 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/dbus/dbus/0001-configure.ac-support-large-file-for-stat64.patch | 53 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch | 21 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/dbus/dbus_1.10.6.bb (renamed from yocto-poky/meta/recipes-core/dbus/dbus.inc) | 39 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/dbus/dbus_1.8.20.bb | 4 |
8 files changed, 104 insertions, 39 deletions
diff --git a/yocto-poky/meta/recipes-core/dbus/dbus-glib.inc b/yocto-poky/meta/recipes-core/dbus/dbus-glib.inc index abd013247..4661e3af5 100644 --- a/yocto-poky/meta/recipes-core/dbus/dbus-glib.inc +++ b/yocto-poky/meta/recipes-core/dbus/dbus-glib.inc @@ -15,7 +15,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz file://test-install-makefile.patch \ " -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext bash-completion #default disable regression tests, some unit test code in non testing code #PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf @@ -26,18 +26,14 @@ EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" -PACKAGES += "${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests" +PACKAGES += "${PN}-tests" FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ - ${libexecdir}/dbus-bash-completion-helper" +FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" FILES_${PN}-dev += "${bindir}/dbus-binding-tool" RDEPENDS_${PN}-tests += "dbus-x11" FILES_${PN}-tests = "${datadir}/${BPN}/tests" -FILES_${PN}-tests-dbg = "${datadir}/${BPN}/tests/.debug/* \ - ${datadir}/${BPN}/tests/core/.debug/* \ - ${datadir}/${BPN}/tests/interfaces/.debug/*" BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.104.bb b/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.104.bb deleted file mode 100644 index c1263c0af..000000000 --- a/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.104.bb +++ /dev/null @@ -1,4 +0,0 @@ -require dbus-glib.inc - -SRC_URI[md5sum] = "5497d2070709cf796f1878c75a72a039" -SRC_URI[sha256sum] = "bfc1f1a82bfc3ec3ecafe04d0e87bab7e999f50dce4f4a34d0b89caf6bd821f6" diff --git a/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.106.bb b/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.106.bb new file mode 100644 index 000000000..0ae848e40 --- /dev/null +++ b/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.106.bb @@ -0,0 +1,4 @@ +require dbus-glib.inc + +SRC_URI[md5sum] = "2eea0b7f52b49f600a07abfd8535d4e4" +SRC_URI[sha256sum] = "b38952706dcf68bad9c302999ef0f420b8cf1a2428227123f0ac4764b689c046" diff --git a/yocto-poky/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/yocto-poky/meta/recipes-core/dbus/dbus-test_1.10.6.bb index 704070bf2..a768a09c4 100644 --- a/yocto-poky/meta/recipes-core/dbus/dbus-test_1.8.20.bb +++ b/yocto-poky/meta/recipes-core/dbus/dbus-test_1.10.6.bb @@ -5,7 +5,7 @@ LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" -DEPENDS = "python-pygobject dbus dbus-glib" +DEPENDS = "python-pygobject dbus" RDEPENDS_${PN} += "make" RDEPENDS_${PN}-dev = "" @@ -18,13 +18,13 @@ 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] = "26d0cf3a1c9782cb0e342101f0450440" +SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" -inherit autotools pkgconfig gettext ptest +inherit autotools pkgconfig gettext ptest upstream-version-is-even EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" EXTRA_OECONF_X_class-native = "--without-x" diff --git a/yocto-poky/meta/recipes-core/dbus/dbus/0001-configure.ac-support-large-file-for-stat64.patch b/yocto-poky/meta/recipes-core/dbus/dbus/0001-configure.ac-support-large-file-for-stat64.patch new file mode 100644 index 000000000..c6eac2b7d --- /dev/null +++ b/yocto-poky/meta/recipes-core/dbus/dbus/0001-configure.ac-support-large-file-for-stat64.patch @@ -0,0 +1,53 @@ +From e18bd3a571be716d90bedc835a014472470ae7bd Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 30 Dec 2015 10:58:39 +0800 +Subject: [PATCH] configure.ac: support large-file for stat64 + +While starting dbus-daemon on a 32-bit linux host and it invokes +fstat to load /etc/dbus-1/system.conf through NFS. If system.conf +was created with a large indoe number on 64-bit host. The above +fstat invoking failed. Here is the log of strace: +............ +$ ls -i /etc/dbus-1/system.conf +53778558109 /etc/dbus-1/system.conf + +$ strace /usr/bin/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation +|open("/etc/dbus-1/system.conf", O_RDONLY) = 4 +|fstat64(4, {st_mode=S_IFREG|0644, st_size=3340, ...}) = 0 +|close(4) = 0 +|close(3) = 0 +|write(2, "Failed to start message bus: Fai"..., 109Failed to start message bus: +Failed to stat "/etc/dbus-1/system.conf": Value too large for defined data type +|) = 109 +|exit_group(1) = ? +|+++ exited with 1 +++ +............ + +In this situation, we should support large-file for stat64. Add marco +AC_SYS_LARGEFILE to do the detection at configure time. It can be disabled +by configuring with the `--disable-largefile' option. + +Upstream-Status: Backport + +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93545 +https://bugs.freedesktop.org/attachment.cgi?id=120747 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 82806ba..cb5a60b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,6 +64,7 @@ AC_SUBST(DBUS_VERSION) + AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_CXX + AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_ISC_POSIX + AC_HEADER_STDC +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch b/yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch index 294400247..da2f10c72 100644 --- a/yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch +++ b/yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch @@ -7,19 +7,28 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> ---- 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 @@ +--- + configure.ac | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 80d27b4..becc1cc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -279,13 +279,6 @@ if test "x$enable_tests" = xyes; then # 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 AM_PATH_PYTHON([2.6], [], [:]) +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-core/dbus/dbus.inc b/yocto-poky/meta/recipes-core/dbus/dbus_1.10.6.bb index 3971081fd..245798a00 100644 --- a/yocto-poky/meta/recipes-core/dbus/dbus.inc +++ b/yocto-poky/meta/recipes-core/dbus/dbus_1.10.6.bb @@ -17,9 +17,13 @@ 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://0001-configure.ac-support-large-file-for-stat64.patch \ " -inherit useradd autotools pkgconfig gettext update-rc.d +SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440" +SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f" + +inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even INITSCRIPT_NAME = "dbus-1" INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." @@ -55,15 +59,22 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-monitor \ ${bindir}/dbus-launch \ ${bindir}/dbus-run-session \ + ${bindir}/dbus-update-activation-environment \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ - ${systemd_unitdir}/system/" + ${datadir}/dbus-1/session.d \ + ${datadir}/dbus-1/session.conf \ + ${datadir}/dbus-1/system.d \ + ${datadir}/dbus-1/system.conf \ + ${systemd_system_unitdir} \ + ${systemd_user_unitdir} \ +" FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool" pkg_postinst_dbus() { # If both systemd and sysvinit are enabled, mask the dbus-1 init script @@ -83,20 +94,20 @@ EXTRA_OECONF = "--disable-tests \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ - --disable-systemd \ - --without-dbus-glib" + " EXTRA_OECONF_append_class-native = " --disable-selinux" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -# Would like to --enable-systemd but that's a circular build-dependency between -# systemd<->dbus -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" do_install() { autotools_do_install @@ -109,12 +120,12 @@ do_install() { 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 -m 0644 ${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 + install -d ${D}${systemd_system_unitdir}/$i; done + install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_system_unitdir}/ + cd ${D}${systemd_system_unitdir}/dbus.target.wants/ + ln -fs ../dbus.socket ${D}${systemd_system_unitdir}/dbus.target.wants/dbus.socket + ln -fs ../dbus.socket ${D}${systemd_system_unitdir}/sockets.target.wants/dbus.socket + ln -fs ../dbus.service ${D}${systemd_system_unitdir}/multi-user.target.wants/dbus.service fi install -d ${D}${sysconfdir}/default/volatiles diff --git a/yocto-poky/meta/recipes-core/dbus/dbus_1.8.20.bb b/yocto-poky/meta/recipes-core/dbus/dbus_1.8.20.bb deleted file mode 100644 index a8f2094ea..000000000 --- a/yocto-poky/meta/recipes-core/dbus/dbus_1.8.20.bb +++ /dev/null @@ -1,4 +0,0 @@ -include dbus.inc - -SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" -SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" |
