aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Andersson <gandersson@genivi.org>2018-08-27 14:53:20 +0200
committergunnarx <gunnarx@users.noreply.github.com>2018-09-06 18:14:00 +0200
commitabca8029c8771a5b7f7d1de96aa327d08bea68f8 (patch)
tree6b83121af0e062fcc7e588b9018026c23194604d
parente5db24b9776378baaf67a8a400ec778ac801b9ea (diff)
downloadmeta-ivi-abca8029c8771a5b7f7d1de96aa327d08bea68f8.tar.gz
meta-ivi-abca8029c8771a5b7f7d1de96aa327d08bea68f8.tar.bz2
meta-ivi-abca8029c8771a5b7f7d1de96aa327d08bea68f8.zip
dbus.bbappend: Remove patch for readdir/readdir_r
A patch was applied previously to make dbus 1.10 compile correctly in the presence of the readdir_r call (and only for qemux86, 32-bit). The update to poky/sumo now builds dbus 1.12 Between 1.10 and 1.12 the code has moved and more importantly the readdir_r seems to have been changed back to readdir, so the patch cannot apply. Let's try removing the patch. The single patch however mixed different things. Testing shows that the signed/unsigned mismatch is still a problem (warning which is treated as an error) but only on 32-bit compilation. This part of the patch is therefore kept for now. I have not deeply analyzed the effect of this cast, just keeping what was already there. [BASE-63] master fails application of dbus patch for qemux86 target Signed-off-by: Gunnar Andersson <gandersson@genivi.org>
-rw-r--r--meta-ivi/recipes-core-ivi/dbus/dbus/build_fix-ubunt1604-qemux86.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/build_fix-ubunt1604-qemux86.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/build_fix-ubunt1604-qemux86.patch
index dc37466..b1ddbcb 100644
--- a/meta-ivi/recipes-core-ivi/dbus/dbus/build_fix-ubunt1604-qemux86.patch
+++ b/meta-ivi/recipes-core-ivi/dbus/dbus/build_fix-ubunt1604-qemux86.patch
@@ -1,24 +1,3 @@
---- dbus-1.10.10/dbus/dbus-sysdeps-unix.c.orig 2017-01-26 20:39:27.868191644 +0900
-+++ dbus-1.10.10/dbus/dbus-sysdeps-unix.c 2017-01-26 20:43:15.708197478 +0900
-@@ -4320,13 +4320,14 @@
- {
- for (;;)
- {
-- struct dirent buf, *de;
-- int k, fd;
-+ struct dirent *de;
-+ int fd;
- long l;
- char *e = NULL;
-
-- k = readdir_r (d, &buf, &de);
-- if (k != 0 || !de)
-+ errno = 0;
-+ de = readdir (d);
-+ if (!de && errno)
- break;
-
- if (de->d_name[0] == '.')
--- dbus-1.10.10/dbus/dbus-message.c.orig 2017-01-26 20:32:02.456180239 +0900
+++ dbus-1.10.10/dbus/dbus-message.c 2017-01-26 20:32:27.288180875 +0900
@@ -4128,7 +4128,7 @@
@@ -30,15 +9,3 @@
{
int *a = dbus_realloc(loader->unix_fds,
loader->max_message_unix_fds * sizeof(loader->unix_fds[0]));
---- dbus-1.10.10/dbus/dbus-shell.c.orig 2017-01-26 20:45:49.292201410 +0900
-+++ dbus-1.10.10/dbus/dbus-shell.c 2017-01-26 20:47:39.840204241 +0900
-@@ -419,7 +419,9 @@
- {
- case '\n':
- if (!delimit_token (&current_token, &retval, error))
-+ {
- goto error;
-+ }
-
- _dbus_string_free (&current_token);
-