diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2016-06-17 11:36:44 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-23 14:26:15 +0100 |
| commit | 1bf1af525af0d9c5335b6d671eeb2891500d6d93 (patch) | |
| tree | 1dbff731cc0c9e4f3761b9bed5603cae29b6f126 /meta/recipes-core/dbus | |
| parent | 1137709119b38c6c7e69450a251f484d3a218747 (diff) | |
| download | poky-1bf1af525af0d9c5335b6d671eeb2891500d6d93.tar.gz | |
dbus/dbus-test: upgrade to 1.10.8
0001-configure.ac-support-large-file-for-stat64.patch is removed as it's
a backported patch and is already in the latest codes.
(From OE-Core rev: ba0493391207c5e170548a58c49ca593b4d61e08)
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/recipes-core/dbus')
| -rw-r--r-- | meta/recipes-core/dbus/dbus-test_1.10.8.bb (renamed from meta/recipes-core/dbus/dbus-test_1.10.6.bb) | 4 | ||||
| -rw-r--r-- | meta/recipes-core/dbus/dbus/0001-configure.ac-support-large-file-for-stat64.patch | 53 | ||||
| -rw-r--r-- | meta/recipes-core/dbus/dbus_1.10.8.bb (renamed from meta/recipes-core/dbus/dbus_1.10.6.bb) | 5 |
3 files changed, 4 insertions, 58 deletions
diff --git a/meta/recipes-core/dbus/dbus-test_1.10.6.bb b/meta/recipes-core/dbus/dbus-test_1.10.8.bb index af999766ff..87dcd37ded 100644 --- a/meta/recipes-core/dbus/dbus-test_1.10.6.bb +++ b/meta/recipes-core/dbus/dbus-test_1.10.8.bb | |||
| @@ -17,8 +17,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | |||
| 17 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | 17 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440" | 20 | SRC_URI[md5sum] = "e912e930f249454752512aa7ac864d43" |
| 21 | SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f" | 21 | SRC_URI[sha256sum] = "baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014" |
| 22 | 22 | ||
| 23 | S="${WORKDIR}/dbus-${PV}" | 23 | S="${WORKDIR}/dbus-${PV}" |
| 24 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" | 24 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" |
diff --git a/meta/recipes-core/dbus/dbus/0001-configure.ac-support-large-file-for-stat64.patch b/meta/recipes-core/dbus/dbus/0001-configure.ac-support-large-file-for-stat64.patch deleted file mode 100644 index c6eac2b7dc..0000000000 --- a/meta/recipes-core/dbus/dbus/0001-configure.ac-support-large-file-for-stat64.patch +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | From e18bd3a571be716d90bedc835a014472470ae7bd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Wed, 30 Dec 2015 10:58:39 +0800 | ||
| 4 | Subject: [PATCH] configure.ac: support large-file for stat64 | ||
| 5 | |||
| 6 | While starting dbus-daemon on a 32-bit linux host and it invokes | ||
| 7 | fstat to load /etc/dbus-1/system.conf through NFS. If system.conf | ||
| 8 | was created with a large indoe number on 64-bit host. The above | ||
| 9 | fstat invoking failed. Here is the log of strace: | ||
| 10 | ............ | ||
| 11 | $ ls -i /etc/dbus-1/system.conf | ||
| 12 | 53778558109 /etc/dbus-1/system.conf | ||
| 13 | |||
| 14 | $ strace /usr/bin/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation | ||
| 15 | |open("/etc/dbus-1/system.conf", O_RDONLY) = 4 | ||
| 16 | |fstat64(4, {st_mode=S_IFREG|0644, st_size=3340, ...}) = 0 | ||
| 17 | |close(4) = 0 | ||
| 18 | |close(3) = 0 | ||
| 19 | |write(2, "Failed to start message bus: Fai"..., 109Failed to start message bus: | ||
| 20 | Failed to stat "/etc/dbus-1/system.conf": Value too large for defined data type | ||
| 21 | |) = 109 | ||
| 22 | |exit_group(1) = ? | ||
| 23 | |+++ exited with 1 +++ | ||
| 24 | ............ | ||
| 25 | |||
| 26 | In this situation, we should support large-file for stat64. Add marco | ||
| 27 | AC_SYS_LARGEFILE to do the detection at configure time. It can be disabled | ||
| 28 | by configuring with the `--disable-largefile' option. | ||
| 29 | |||
| 30 | Upstream-Status: Backport | ||
| 31 | |||
| 32 | Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93545 | ||
| 33 | https://bugs.freedesktop.org/attachment.cgi?id=120747 | ||
| 34 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 35 | --- | ||
| 36 | configure.ac | 1 + | ||
| 37 | 1 file changed, 1 insertion(+) | ||
| 38 | |||
| 39 | diff --git a/configure.ac b/configure.ac | ||
| 40 | index 82806ba..cb5a60b 100644 | ||
| 41 | --- a/configure.ac | ||
| 42 | +++ b/configure.ac | ||
| 43 | @@ -64,6 +64,7 @@ AC_SUBST(DBUS_VERSION) | ||
| 44 | AC_PROG_CC | ||
| 45 | AM_PROG_CC_C_O | ||
| 46 | AC_PROG_CXX | ||
| 47 | AC_USE_SYSTEM_EXTENSIONS | ||
| 48 | +AC_SYS_LARGEFILE | ||
| 49 | AC_ISC_POSIX | ||
| 50 | AC_HEADER_STDC | ||
| 51 | -- | ||
| 52 | 1.9.1 | ||
| 53 | |||
diff --git a/meta/recipes-core/dbus/dbus_1.10.6.bb b/meta/recipes-core/dbus/dbus_1.10.8.bb index 245798a00f..bfaf65aeb8 100644 --- a/meta/recipes-core/dbus/dbus_1.10.6.bb +++ b/meta/recipes-core/dbus/dbus_1.10.8.bb | |||
| @@ -17,11 +17,10 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | |||
| 17 | file://dbus-1.init \ | 17 | file://dbus-1.init \ |
| 18 | file://os-test.patch \ | 18 | file://os-test.patch \ |
| 19 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | 19 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ |
| 20 | file://0001-configure.ac-support-large-file-for-stat64.patch \ | ||
| 21 | " | 20 | " |
| 22 | 21 | ||
| 23 | SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440" | 22 | SRC_URI[md5sum] = "e912e930f249454752512aa7ac864d43" |
| 24 | SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f" | 23 | SRC_URI[sha256sum] = "baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014" |
| 25 | 24 | ||
| 26 | inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even | 25 | inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even |
| 27 | 26 | ||
