summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch148
-rw-r--r--meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch35
-rw-r--r--meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb (renamed from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb)4
3 files changed, 37 insertions, 150 deletions
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
deleted file mode 100644
index f0fc0bcb2c..0000000000
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1Upstream-Status: Submitted [https://github.com/GENIVI/dlt-daemon/pull/204]
2From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
3From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
4Date: Sat, 25 Jan 2020 09:08:07 +0100
5Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
6 implementation, by adding a missing include for pthread_t reference:
7
8see https://errors.yoctoproject.org/Errors/Details/308000/ for details
9
10Thanks Khem Raj <raj.khem@gmail.com> for the report
11
12Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
13Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
14---
15 include/dlt/dlt_user.h | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
19index 69cb854..766d349 100644
20--- a/include/dlt/dlt_user.h
21+++ b/include/dlt/dlt_user.h
22@@ -74,6 +74,7 @@
23 \{
24 */
25 # include <mqueue.h>
26+# include <pthread.h>
27
28 # if !defined (__WIN32__)
29 # include <semaphore.h>
30
31From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
32From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
33Date: Sat, 25 Jan 2020 09:16:14 +0100
34Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
35 compiler flags, due to uint being undefined. This is actually an "int" type,
36 looking at the test implementation
37
38Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
39Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
40---
41 src/tests/dlt-test-init-free.c | 4 ++--
42 1 file changed, 2 insertions(+), 2 deletions(-)
43
44diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c
45index 96b5245..35b8803 100644
46--- a/src/tests/dlt-test-init-free.c
47+++ b/src/tests/dlt-test-init-free.c
48@@ -32,7 +32,7 @@
49
50 void exec(const char *cmd, char *buffer, size_t length);
51 void printMemoryUsage();
52-char *occupyMemory(uint size);
53+char *occupyMemory(int size);
54 void do_example_test();
55 void do_dlt_test();
56
57@@ -131,7 +131,7 @@ void printMemoryUsage()
58 printf("%s", result);
59 }
60
61-char *occupyMemory(uint size)
62+char *occupyMemory(int size)
63 {
64 char *buf = (char *)malloc(size * sizeof(char));
65
66
67From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
68From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
69Date: Sat, 25 Jan 2020 09:20:48 +0100
70Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include header, now
71 glibc/musl wants poll.h being included directly. This fixes a build failure
72 on musl systems with strict c hardening flags
73
74Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
75Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
76---
77 src/console/logstorage/dlt-logstorage-ctrl.c | 2 +-
78 src/daemon/dlt_daemon_event_handler.c | 2 +-
79 src/daemon/dlt_daemon_event_handler.h | 2 +-
80 src/daemon/dlt_daemon_event_handler_types.h | 2 +-
81 src/lib/dlt_user.c | 2 +-
82 5 files changed, 5 insertions(+), 5 deletions(-)
83
84diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c b/src/console/logstorage/dlt-logstorage-ctrl.c
85index 525c137..6614f44 100644
86--- a/src/console/logstorage/dlt-logstorage-ctrl.c
87+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
88@@ -61,7 +61,7 @@
89 #include <string.h>
90 #include <getopt.h>
91
92-#include <sys/poll.h>
93+#include <poll.h>
94
95 #if defined(__linux__)
96 # include "sd-daemon.h"
97diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c
98index 1611f7b..0d463da 100644
99--- a/src/daemon/dlt_daemon_event_handler.c
100+++ b/src/daemon/dlt_daemon_event_handler.c
101@@ -30,7 +30,7 @@
102 #include <string.h>
103 #include <errno.h>
104
105-#include <sys/poll.h>
106+#include <poll.h>
107 #include <syslog.h>
108
109 #include "dlt_common.h"
110diff --git a/src/daemon/dlt_daemon_event_handler.h b/src/daemon/dlt_daemon_event_handler.h
111index eb96101..bd550d3 100644
112--- a/src/daemon/dlt_daemon_event_handler.h
113+++ b/src/daemon/dlt_daemon_event_handler.h
114@@ -25,7 +25,7 @@
115 * \file dlt_daemon_event_handler.h
116 */
117
118-#include <sys/poll.h>
119+#include <poll.h>
120
121 #include "dlt_daemon_connection_types.h"
122 #include "dlt_daemon_event_handler_types.h"
123diff --git a/src/daemon/dlt_daemon_event_handler_types.h b/src/daemon/dlt_daemon_event_handler_types.h
124index 370e503..0b16d08 100644
125--- a/src/daemon/dlt_daemon_event_handler_types.h
126+++ b/src/daemon/dlt_daemon_event_handler_types.h
127@@ -25,7 +25,7 @@
128 * \file dlt_daemon_event_handler_types.h
129 */
130
131-#include <sys/poll.h>
132+#include <poll.h>
133
134 #include "dlt_daemon_connection_types.h"
135
136#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
137#index ffa9b09..511f991 100644
138#--- a/src/lib/dlt_user.c
139#+++ b/src/lib/dlt_user.c
140#@@ -43,7 +43,7 @@
141# #include <errno.h>
142#
143# #include <sys/uio.h> /* writev() */
144#-#include <sys/poll.h>
145#+#include <poll.h>
146#
147# #include <limits.h>
148# #ifdef linux
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
new file mode 100644
index 0000000000..14c44e6edd
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
@@ -0,0 +1,35 @@
1From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
2From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
3Date: Fri, 31 Jul 2020 15:26:35 +0200
4Subject: [PATCH] dlt_offline: fix build failures with gcc-10
5
6see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
7
8/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_client.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
9/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here
10/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
11/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here
12/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
13/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here
14/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
15/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
16---
17 src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h
21index b58da70..8ad84b8 100644
22--- a/src/offlinelogstorage/dlt_offline_logstorage.h
23+++ b/src/offlinelogstorage/dlt_offline_logstorage.h
24@@ -114,9 +114,9 @@
25 #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s))
26
27 /* logstorage max cache */
28-unsigned int g_logstorage_cache_max;
29+static unsigned int g_logstorage_cache_max;
30 /* current logstorage cache size */
31-unsigned int g_logstorage_cache_size;
32+static unsigned int g_logstorage_cache_size;
33
34 typedef struct
35 {
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index 35c638bc78..3f50896728 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
@@ -17,9 +17,9 @@ DEPENDS = "zlib gzip-native"
17SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ 17SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
18 file://0002-Don-t-execute-processes-as-a-specific-user.patch \ 18 file://0002-Don-t-execute-processes-as-a-specific-user.patch \
19 file://0004-Modify-systemd-config-directory.patch \ 19 file://0004-Modify-systemd-config-directory.patch \
20 file://204.patch \ 20 file://238.patch \
21" 21"
22SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4" 22SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
23 23
24S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"
25 25
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-30 01:42:00 +0000