summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.patch53
-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
20SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440" 20SRC_URI[md5sum] = "e912e930f249454752512aa7ac864d43"
21SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f" 21SRC_URI[sha256sum] = "baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014"
22 22
23S="${WORKDIR}/dbus-${PV}" 23S="${WORKDIR}/dbus-${PV}"
24FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" 24FILESEXTRAPATHS =. "${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 @@
1From e18bd3a571be716d90bedc835a014472470ae7bd Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 30 Dec 2015 10:58:39 +0800
4Subject: [PATCH] configure.ac: support large-file for stat64
5
6While starting dbus-daemon on a 32-bit linux host and it invokes
7fstat to load /etc/dbus-1/system.conf through NFS. If system.conf
8was created with a large indoe number on 64-bit host. The above
9fstat invoking failed. Here is the log of strace:
10............
11$ ls -i /etc/dbus-1/system.conf
1253778558109 /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:
20Failed 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
26In this situation, we should support large-file for stat64. Add marco
27AC_SYS_LARGEFILE to do the detection at configure time. It can be disabled
28by configuring with the `--disable-largefile' option.
29
30Upstream-Status: Backport
31
32Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93545
33https://bugs.freedesktop.org/attachment.cgi?id=120747
34Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
35---
36 configure.ac | 1 +
37 1 file changed, 1 insertion(+)
38
39diff --git a/configure.ac b/configure.ac
40index 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--
521.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
23SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440" 22SRC_URI[md5sum] = "e912e930f249454752512aa7ac864d43"
24SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f" 23SRC_URI[sha256sum] = "baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014"
25 24
26inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even 25inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
27 26