[meta-oe,1/4] dlt-daemon: update to 2.18.5

Submitted by Gianfranco Costamagna on July 31, 2020, 2:42 p.m. | Patch ID: 174956

Details

Message ID 20200731144302.7074-1-costamagnagianfranco@yahoo.it
State Superseded
Headers show

Commit Message

Gianfranco Costamagna July 31, 2020, 2:42 p.m.
- drop patch 204: upstream
 - add gcc-10 build fix proposed upstream 238.patch

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
---
 .../dlt-daemon/dlt-daemon/204.patch           | 148 ------------------
 .../dlt-daemon/dlt-daemon/238.patch           |  35 +++++
 ...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} |   4 +-
 3 files changed, 37 insertions(+), 150 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
 create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
 rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} (97%)

Patch hide | download patch | download mbox

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 f0fc0bcb2..000000000
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
+++ /dev/null
@@ -1,148 +0,0 @@ 
-Upstream-Status: Submitted [https://github.com/GENIVI/dlt-daemon/pull/204]
-From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Sat, 25 Jan 2020 09:08:07 +0100
-Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
- implementation, by adding a missing include for pthread_t reference:
-
-see https://errors.yoctoproject.org/Errors/Details/308000/ for details
-
-Thanks Khem Raj <raj.khem@gmail.com> for the report
-
-Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
----
- include/dlt/dlt_user.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
-index 69cb854..766d349 100644
---- a/include/dlt/dlt_user.h
-+++ b/include/dlt/dlt_user.h
-@@ -74,6 +74,7 @@
-  \{
-  */
- #   include <mqueue.h>
-+#   include <pthread.h>
- 
- #   if !defined (__WIN32__)
- #      include <semaphore.h>
-
-From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Sat, 25 Jan 2020 09:16:14 +0100
-Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
- compiler flags, due to uint being undefined. This is actually an "int" type,
- looking at the test implementation
-
-Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
----
- src/tests/dlt-test-init-free.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c
-index 96b5245..35b8803 100644
---- a/src/tests/dlt-test-init-free.c
-+++ b/src/tests/dlt-test-init-free.c
-@@ -32,7 +32,7 @@
- 
- void exec(const char *cmd, char *buffer, size_t length);
- void printMemoryUsage();
--char *occupyMemory(uint size);
-+char *occupyMemory(int size);
- void do_example_test();
- void do_dlt_test();
- 
-@@ -131,7 +131,7 @@ void printMemoryUsage()
-     printf("%s", result);
- }
- 
--char *occupyMemory(uint size)
-+char *occupyMemory(int size)
- {
-     char *buf = (char *)malloc(size * sizeof(char));
- 
-
-From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Sat, 25 Jan 2020 09:20:48 +0100
-Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include header, now
- glibc/musl wants poll.h being included directly. This fixes a build failure
- on musl systems with strict c hardening flags
-
-Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
----
- src/console/logstorage/dlt-logstorage-ctrl.c | 2 +-
- src/daemon/dlt_daemon_event_handler.c        | 2 +-
- src/daemon/dlt_daemon_event_handler.h        | 2 +-
- src/daemon/dlt_daemon_event_handler_types.h  | 2 +-
- src/lib/dlt_user.c                           | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c b/src/console/logstorage/dlt-logstorage-ctrl.c
-index 525c137..6614f44 100644
---- a/src/console/logstorage/dlt-logstorage-ctrl.c
-+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
-@@ -61,7 +61,7 @@
- #include <string.h>
- #include <getopt.h>
- 
--#include <sys/poll.h>
-+#include <poll.h>
- 
- #if defined(__linux__)
- #   include "sd-daemon.h"
-diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c
-index 1611f7b..0d463da 100644
---- a/src/daemon/dlt_daemon_event_handler.c
-+++ b/src/daemon/dlt_daemon_event_handler.c
-@@ -30,7 +30,7 @@
- #include <string.h>
- #include <errno.h>
- 
--#include <sys/poll.h>
-+#include <poll.h>
- #include <syslog.h>
- 
- #include "dlt_common.h"
-diff --git a/src/daemon/dlt_daemon_event_handler.h b/src/daemon/dlt_daemon_event_handler.h
-index eb96101..bd550d3 100644
---- a/src/daemon/dlt_daemon_event_handler.h
-+++ b/src/daemon/dlt_daemon_event_handler.h
-@@ -25,7 +25,7 @@
-  * \file dlt_daemon_event_handler.h
-  */
- 
--#include <sys/poll.h>
-+#include <poll.h>
- 
- #include "dlt_daemon_connection_types.h"
- #include "dlt_daemon_event_handler_types.h"
-diff --git a/src/daemon/dlt_daemon_event_handler_types.h b/src/daemon/dlt_daemon_event_handler_types.h
-index 370e503..0b16d08 100644
---- a/src/daemon/dlt_daemon_event_handler_types.h
-+++ b/src/daemon/dlt_daemon_event_handler_types.h
-@@ -25,7 +25,7 @@
-  * \file dlt_daemon_event_handler_types.h
-  */
- 
--#include <sys/poll.h>
-+#include <poll.h>
- 
- #include "dlt_daemon_connection_types.h"
- 
-#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
-#index ffa9b09..511f991 100644
-#--- a/src/lib/dlt_user.c
-#+++ b/src/lib/dlt_user.c
-#@@ -43,7 +43,7 @@
-# #include <errno.h>
-# 
-# #include <sys/uio.h> /* writev() */
-#-#include <sys/poll.h>
-#+#include <poll.h>
-# 
-# #include <limits.h>
-# #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 000000000..14c44e6ed
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
@@ -0,0 +1,35 @@ 
+From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Fri, 31 Jul 2020 15:26:35 +0200
+Subject: [PATCH] dlt_offline: fix build failures with gcc-10
+
+see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
+
+/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
+/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
+/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
+/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
+/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
+/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
+/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
+/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
+---
+ src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h
+index b58da70..8ad84b8 100644
+--- a/src/offlinelogstorage/dlt_offline_logstorage.h
++++ b/src/offlinelogstorage/dlt_offline_logstorage.h
+@@ -114,9 +114,9 @@
+ #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s))
+ 
+ /* logstorage max cache */
+-unsigned int g_logstorage_cache_max;
++static unsigned int g_logstorage_cache_max;
+ /* current logstorage cache size */
+-unsigned int g_logstorage_cache_size;
++static unsigned int g_logstorage_cache_size;
+ 
+ typedef struct
+ {
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
similarity index 97%
rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb
rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
index 35c638bc7..3f5089672 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"
 SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
     file://0002-Don-t-execute-processes-as-a-specific-user.patch \
     file://0004-Modify-systemd-config-directory.patch \
-    file://204.patch \
+    file://238.patch \
 "
-SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4"
+SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
 
 S = "${WORKDIR}/git"
 

Comments

Khem Raj Aug. 2, 2020, 7 a.m.
This fails on musl

http://errors.yoctoproject.org/Errors/Details/427081/

On Fri, Jul 31, 2020 at 7:43 AM Gianfranco
<costamagna.gianfranco@gmail.com> wrote:
>
>  - drop patch 204: upstream
>  - add gcc-10 build fix proposed upstream 238.patch
>
> Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ---
>  .../dlt-daemon/dlt-daemon/204.patch           | 148 ------------------
>  .../dlt-daemon/dlt-daemon/238.patch           |  35 +++++
>  ...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} |   4 +-
>  3 files changed, 37 insertions(+), 150 deletions(-)
>  delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>  create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
>  rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} (97%)
>
> 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 f0fc0bcb2..000000000
> --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
> +++ /dev/null
> @@ -1,148 +0,0 @@
> -Upstream-Status: Submitted [https://github.com/GENIVI/dlt-daemon/pull/204]
> -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
> -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> -Date: Sat, 25 Jan 2020 09:08:07 +0100
> -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
> - implementation, by adding a missing include for pthread_t reference:
> -
> -see https://errors.yoctoproject.org/Errors/Details/308000/ for details
> -
> -Thanks Khem Raj <raj.khem@gmail.com> for the report
> -
> -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ----
> - include/dlt/dlt_user.h | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
> -index 69cb854..766d349 100644
> ---- a/include/dlt/dlt_user.h
> -+++ b/include/dlt/dlt_user.h
> -@@ -74,6 +74,7 @@
> -  \{
> -  */
> - #   include <mqueue.h>
> -+#   include <pthread.h>
> -
> - #   if !defined (__WIN32__)
> - #      include <semaphore.h>
> -
> -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
> -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> -Date: Sat, 25 Jan 2020 09:16:14 +0100
> -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
> - compiler flags, due to uint being undefined. This is actually an "int" type,
> - looking at the test implementation
> -
> -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ----
> - src/tests/dlt-test-init-free.c | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c
> -index 96b5245..35b8803 100644
> ---- a/src/tests/dlt-test-init-free.c
> -+++ b/src/tests/dlt-test-init-free.c
> -@@ -32,7 +32,7 @@
> -
> - void exec(const char *cmd, char *buffer, size_t length);
> - void printMemoryUsage();
> --char *occupyMemory(uint size);
> -+char *occupyMemory(int size);
> - void do_example_test();
> - void do_dlt_test();
> -
> -@@ -131,7 +131,7 @@ void printMemoryUsage()
> -     printf("%s", result);
> - }
> -
> --char *occupyMemory(uint size)
> -+char *occupyMemory(int size)
> - {
> -     char *buf = (char *)malloc(size * sizeof(char));
> -
> -
> -From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
> -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> -Date: Sat, 25 Jan 2020 09:20:48 +0100
> -Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include header, now
> - glibc/musl wants poll.h being included directly. This fixes a build failure
> - on musl systems with strict c hardening flags
> -
> -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ----
> - src/console/logstorage/dlt-logstorage-ctrl.c | 2 +-
> - src/daemon/dlt_daemon_event_handler.c        | 2 +-
> - src/daemon/dlt_daemon_event_handler.h        | 2 +-
> - src/daemon/dlt_daemon_event_handler_types.h  | 2 +-
> - src/lib/dlt_user.c                           | 2 +-
> - 5 files changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c b/src/console/logstorage/dlt-logstorage-ctrl.c
> -index 525c137..6614f44 100644
> ---- a/src/console/logstorage/dlt-logstorage-ctrl.c
> -+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
> -@@ -61,7 +61,7 @@
> - #include <string.h>
> - #include <getopt.h>
> -
> --#include <sys/poll.h>
> -+#include <poll.h>
> -
> - #if defined(__linux__)
> - #   include "sd-daemon.h"
> -diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c
> -index 1611f7b..0d463da 100644
> ---- a/src/daemon/dlt_daemon_event_handler.c
> -+++ b/src/daemon/dlt_daemon_event_handler.c
> -@@ -30,7 +30,7 @@
> - #include <string.h>
> - #include <errno.h>
> -
> --#include <sys/poll.h>
> -+#include <poll.h>
> - #include <syslog.h>
> -
> - #include "dlt_common.h"
> -diff --git a/src/daemon/dlt_daemon_event_handler.h b/src/daemon/dlt_daemon_event_handler.h
> -index eb96101..bd550d3 100644
> ---- a/src/daemon/dlt_daemon_event_handler.h
> -+++ b/src/daemon/dlt_daemon_event_handler.h
> -@@ -25,7 +25,7 @@
> -  * \file dlt_daemon_event_handler.h
> -  */
> -
> --#include <sys/poll.h>
> -+#include <poll.h>
> -
> - #include "dlt_daemon_connection_types.h"
> - #include "dlt_daemon_event_handler_types.h"
> -diff --git a/src/daemon/dlt_daemon_event_handler_types.h b/src/daemon/dlt_daemon_event_handler_types.h
> -index 370e503..0b16d08 100644
> ---- a/src/daemon/dlt_daemon_event_handler_types.h
> -+++ b/src/daemon/dlt_daemon_event_handler_types.h
> -@@ -25,7 +25,7 @@
> -  * \file dlt_daemon_event_handler_types.h
> -  */
> -
> --#include <sys/poll.h>
> -+#include <poll.h>
> -
> - #include "dlt_daemon_connection_types.h"
> -
> -#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
> -#index ffa9b09..511f991 100644
> -#--- a/src/lib/dlt_user.c
> -#+++ b/src/lib/dlt_user.c
> -#@@ -43,7 +43,7 @@
> -# #include <errno.h>
> -#
> -# #include <sys/uio.h> /* writev() */
> -#-#include <sys/poll.h>
> -#+#include <poll.h>
> -#
> -# #include <limits.h>
> -# #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 000000000..14c44e6ed
> --- /dev/null
> +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> @@ -0,0 +1,35 @@
> +From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
> +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> +Date: Fri, 31 Jul 2020 15:26:35 +0200
> +Subject: [PATCH] dlt_offline: fix build failures with gcc-10
> +
> +see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
> +
> +/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
> +/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
> +/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
> +/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
> +/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
> +/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
> +/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
> +/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
> +---
> + src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h
> +index b58da70..8ad84b8 100644
> +--- a/src/offlinelogstorage/dlt_offline_logstorage.h
> ++++ b/src/offlinelogstorage/dlt_offline_logstorage.h
> +@@ -114,9 +114,9 @@
> + #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s))
> +
> + /* logstorage max cache */
> +-unsigned int g_logstorage_cache_max;
> ++static unsigned int g_logstorage_cache_max;
> + /* current logstorage cache size */
> +-unsigned int g_logstorage_cache_size;
> ++static unsigned int g_logstorage_cache_size;
> +
> + typedef struct
> + {
> 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
> similarity index 97%
> rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb
> rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
> index 35c638bc7..3f5089672 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"
>  SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
>      file://0002-Don-t-execute-processes-as-a-specific-user.patch \
>      file://0004-Modify-systemd-config-directory.patch \
> -    file://204.patch \
> +    file://238.patch \
>  "
> -SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4"
> +SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
>
>  S = "${WORKDIR}/git"
>
> --
> 2.17.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#86106): https://lists.openembedded.org/g/openembedded-devel/message/86106
Mute This Topic: https://lists.openembedded.org/mt/75908501/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Gianfranco Costamagna Aug. 2, 2020, 10:05 p.m.
Hello

I tried to reproduce by running everything on master (master-next for
meta-oe) and bitbake dlt-daemon with MACHINE set to raspberrypi4 or qemux86
and DISTRO=poky-tiny.
I also tried with and without systemd.

It builds just fine.
Do you have a way to share bblayers.conf and local.conf files please?

Thanks

Gianfranco

On Sun, Aug 2, 2020, 09:01 Khem Raj <raj.khem@gmail.com> wrote:

> This fails on musl
>
> http://errors.yoctoproject.org/Errors/Details/427081/
>
> On Fri, Jul 31, 2020 at 7:43 AM Gianfranco
> <costamagna.gianfranco@gmail.com> wrote:
> >
> >  - drop patch 204: upstream
> >  - add gcc-10 build fix proposed upstream 238.patch
> >
> > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > ---
> >  .../dlt-daemon/dlt-daemon/204.patch           | 148 ------------------
> >  .../dlt-daemon/dlt-daemon/238.patch           |  35 +++++
> >  ...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} |   4 +-
> >  3 files changed, 37 insertions(+), 150 deletions(-)
> >  delete mode 100644
> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
> >  create mode 100644
> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> >  rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb =>
> dlt-daemon_2.18.5.bb} (97%)
> >
> > 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 f0fc0bcb2..000000000
> > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
> > +++ /dev/null
> > @@ -1,148 +0,0 @@
> > -Upstream-Status: Submitted [
> https://github.com/GENIVI/dlt-daemon/pull/204]
> > -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > -Date: Sat, 25 Jan 2020 09:08:07 +0100
> > -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
> > - implementation, by adding a missing include for pthread_t reference:
> > -
> > -see https://errors.yoctoproject.org/Errors/Details/308000/ for details
> > -
> > -Thanks Khem Raj <raj.khem@gmail.com> for the report
> > -
> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > ----
> > - include/dlt/dlt_user.h | 1 +
> > - 1 file changed, 1 insertion(+)
> > -
> > -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
> > -index 69cb854..766d349 100644
> > ---- a/include/dlt/dlt_user.h
> > -+++ b/include/dlt/dlt_user.h
> > -@@ -74,6 +74,7 @@
> > -  \{
> > -  */
> > - #   include <mqueue.h>
> > -+#   include <pthread.h>
> > -
> > - #   if !defined (__WIN32__)
> > - #      include <semaphore.h>
> > -
> > -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > -Date: Sat, 25 Jan 2020 09:16:14 +0100
> > -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
> > - compiler flags, due to uint being undefined. This is actually an "int"
> type,
> > - looking at the test implementation
> > -
> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > ----
> > - src/tests/dlt-test-init-free.c | 4 ++--
> > - 1 file changed, 2 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/src/tests/dlt-test-init-free.c
> b/src/tests/dlt-test-init-free.c
> > -index 96b5245..35b8803 100644
> > ---- a/src/tests/dlt-test-init-free.c
> > -+++ b/src/tests/dlt-test-init-free.c
> > -@@ -32,7 +32,7 @@
> > -
> > - void exec(const char *cmd, char *buffer, size_t length);
> > - void printMemoryUsage();
> > --char *occupyMemory(uint size);
> > -+char *occupyMemory(int size);
> > - void do_example_test();
> > - void do_dlt_test();
> > -
> > -@@ -131,7 +131,7 @@ void printMemoryUsage()
> > -     printf("%s", result);
> > - }
> > -
> > --char *occupyMemory(uint size)
> > -+char *occupyMemory(int size)
> > - {
> > -     char *buf = (char *)malloc(size * sizeof(char));
> > -
> > -
> > -From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > -Date: Sat, 25 Jan 2020 09:20:48 +0100
> > -Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include
> header, now
> > - glibc/musl wants poll.h being included directly. This fixes a build
> failure
> > - on musl systems with strict c hardening flags
> > -
> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > ----
> > - src/console/logstorage/dlt-logstorage-ctrl.c | 2 +-
> > - src/daemon/dlt_daemon_event_handler.c        | 2 +-
> > - src/daemon/dlt_daemon_event_handler.h        | 2 +-
> > - src/daemon/dlt_daemon_event_handler_types.h  | 2 +-
> > - src/lib/dlt_user.c                           | 2 +-
> > - 5 files changed, 5 insertions(+), 5 deletions(-)
> > -
> > -diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c
> b/src/console/logstorage/dlt-logstorage-ctrl.c
> > -index 525c137..6614f44 100644
> > ---- a/src/console/logstorage/dlt-logstorage-ctrl.c
> > -+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
> > -@@ -61,7 +61,7 @@
> > - #include <string.h>
> > - #include <getopt.h>
> > -
> > --#include <sys/poll.h>
> > -+#include <poll.h>
> > -
> > - #if defined(__linux__)
> > - #   include "sd-daemon.h"
> > -diff --git a/src/daemon/dlt_daemon_event_handler.c
> b/src/daemon/dlt_daemon_event_handler.c
> > -index 1611f7b..0d463da 100644
> > ---- a/src/daemon/dlt_daemon_event_handler.c
> > -+++ b/src/daemon/dlt_daemon_event_handler.c
> > -@@ -30,7 +30,7 @@
> > - #include <string.h>
> > - #include <errno.h>
> > -
> > --#include <sys/poll.h>
> > -+#include <poll.h>
> > - #include <syslog.h>
> > -
> > - #include "dlt_common.h"
> > -diff --git a/src/daemon/dlt_daemon_event_handler.h
> b/src/daemon/dlt_daemon_event_handler.h
> > -index eb96101..bd550d3 100644
> > ---- a/src/daemon/dlt_daemon_event_handler.h
> > -+++ b/src/daemon/dlt_daemon_event_handler.h
> > -@@ -25,7 +25,7 @@
> > -  * \file dlt_daemon_event_handler.h
> > -  */
> > -
> > --#include <sys/poll.h>
> > -+#include <poll.h>
> > -
> > - #include "dlt_daemon_connection_types.h"
> > - #include "dlt_daemon_event_handler_types.h"
> > -diff --git a/src/daemon/dlt_daemon_event_handler_types.h
> b/src/daemon/dlt_daemon_event_handler_types.h
> > -index 370e503..0b16d08 100644
> > ---- a/src/daemon/dlt_daemon_event_handler_types.h
> > -+++ b/src/daemon/dlt_daemon_event_handler_types.h
> > -@@ -25,7 +25,7 @@
> > -  * \file dlt_daemon_event_handler_types.h
> > -  */
> > -
> > --#include <sys/poll.h>
> > -+#include <poll.h>
> > -
> > - #include "dlt_daemon_connection_types.h"
> > -
> > -#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
> > -#index ffa9b09..511f991 100644
> > -#--- a/src/lib/dlt_user.c
> > -#+++ b/src/lib/dlt_user.c
> > -#@@ -43,7 +43,7 @@
> > -# #include <errno.h>
> > -#
> > -# #include <sys/uio.h> /* writev() */
> > -#-#include <sys/poll.h>
> > -#+#include <poll.h>
> > -#
> > -# #include <limits.h>
> > -# #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 000000000..14c44e6ed
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
> > @@ -0,0 +1,35 @@
> > +From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
> > +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > +Date: Fri, 31 Jul 2020 15:26:35 +0200
> > +Subject: [PATCH] dlt_offline: fix build failures with gcc-10
> > +
> > +see bug report:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
> > +
> > +/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
> > +/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
> > +/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
> > +/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
> > +/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
> > +/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
> > +/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
> > +/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
> > +---
> > + src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
> > + 1 file changed, 2 insertions(+), 2 deletions(-)
> > +
> > +diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h
> b/src/offlinelogstorage/dlt_offline_logstorage.h
> > +index b58da70..8ad84b8 100644
> > +--- a/src/offlinelogstorage/dlt_offline_logstorage.h
> > ++++ b/src/offlinelogstorage/dlt_offline_logstorage.h
> > +@@ -114,9 +114,9 @@
> > + #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s))
> > +
> > + /* logstorage max cache */
> > +-unsigned int g_logstorage_cache_max;
> > ++static unsigned int g_logstorage_cache_max;
> > + /* current logstorage cache size */
> > +-unsigned int g_logstorage_cache_size;
> > ++static unsigned int g_logstorage_cache_size;
> > +
> > + typedef struct
> > + {
> > 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
> > similarity index 97%
> > rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb
> > rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
> > index 35c638bc7..3f5089672 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"
> >  SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https
> <http://github.com/GENIVI/$%7BBPN%7D.git;protocol=https> \
> >      file://0002-Don-t-execute-processes-as-a-specific-user.patch \
> >      file://0004-Modify-systemd-config-directory.patch \
> > -    file://204.patch \
> > +    file://238.patch \
> >  "
> > -SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4"
> > +SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
> >
> >  S = "${WORKDIR}/git"
> >
> > --
> > 2.17.1
> >
> > 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#86110): https://lists.openembedded.org/g/openembedded-devel/message/86110
Mute This Topic: https://lists.openembedded.org/mt/75908501/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Khem Raj Aug. 3, 2020, 2 a.m.
On Sun, Aug 2, 2020 at 3:05 PM Gianfranco Costamagna <
costamagna.gianfranco@gmail.com> wrote:

> Hello
>
> I tried to reproduce by running everything on master (master-next for
> meta-oe) and bitbake dlt-daemon with MACHINE set to raspberrypi4 or qemux86
> and DISTRO=poky-tiny.
> I also tried with and without systemd.
>
> It builds just fine.
> Do you have a way to share bblayers.conf and local.conf files please?
>

It’s perhaps revealed with glibc upgrade patch that I have staged in
yoe/mut branch on yoe distro I will look a bit as well


> Thanks
>
> Gianfranco
>
> On Sun, Aug 2, 2020, 09:01 Khem Raj <raj.khem@gmail.com> wrote:
>
>> This fails on musl
>>
>> http://errors.yoctoproject.org/Errors/Details/427081/
>>
>> On Fri, Jul 31, 2020 at 7:43 AM Gianfranco
>> <costamagna.gianfranco@gmail.com> wrote:
>> >
>> >  - drop patch 204: upstream
>> >  - add gcc-10 build fix proposed upstream 238.patch
>> >
>> > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>> > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>> > ---
>> >  .../dlt-daemon/dlt-daemon/204.patch           | 148 ------------------
>> >  .../dlt-daemon/dlt-daemon/238.patch           |  35 +++++
>> >  ...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} |   4 +-
>> >  3 files changed, 37 insertions(+), 150 deletions(-)
>> >  delete mode 100644
>> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>> >  create mode 100644
>> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
>> >  rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb =>
>> dlt-daemon_2.18.5.bb} (97%)
>> >
>> > 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 f0fc0bcb2..000000000
>> > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>> > +++ /dev/null
>> > @@ -1,148 +0,0 @@
>> > -Upstream-Status: Submitted [
>> https://github.com/GENIVI/dlt-daemon/pull/204]
>> > -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>> > -Date: Sat, 25 Jan 2020 09:08:07 +0100
>> > -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
>> > - implementation, by adding a missing include for pthread_t reference:
>> > -
>> > -see https://errors.yoctoproject.org/Errors/Details/308000/ for details
>> > -
>> > -Thanks Khem Raj <raj.khem@gmail.com> for the report
>> > -
>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>> > ----
>> > - include/dlt/dlt_user.h | 1 +
>> > - 1 file changed, 1 insertion(+)
>> > -
>> > -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
>> > -index 69cb854..766d349 100644
>> > ---- a/include/dlt/dlt_user.h
>> > -+++ b/include/dlt/dlt_user.h
>> > -@@ -74,6 +74,7 @@
>> > -  \{
>> > -  */
>> > - #   include <mqueue.h>
>> > -+#   include <pthread.h>
>> > -
>> > - #   if !defined (__WIN32__)
>> > - #      include <semaphore.h>
>> > -
>> > -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>> > -Date: Sat, 25 Jan 2020 09:16:14 +0100
>> > -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
>> > - compiler flags, due to uint being undefined. This is actually an
>> "int" type,
>> > - looking at the test implementation
>> > -
>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>> > ----
>> > - src/tests/dlt-test-init-free.c | 4 ++--
>> > - 1 file changed, 2 insertions(+), 2 deletions(-)
>> > -
>> > -diff --git a/src/tests/dlt-test-init-free.c
>> b/src/tests/dlt-test-init-free.c
>> > -index 96b5245..35b8803 100644
>> > ---- a/src/tests/dlt-test-init-free.c
>> > -+++ b/src/tests/dlt-test-init-free.c
>> > -@@ -32,7 +32,7 @@
>> > -
>> > - void exec(const char *cmd, char *buffer, size_t length);
>> > - void printMemoryUsage();
>> > --char *occupyMemory(uint size);
>> > -+char *occupyMemory(int size);
>> > - void do_example_test();
>> > - void do_dlt_test();
>> > -
>> > -@@ -131,7 +131,7 @@ void printMemoryUsage()
>> > -     printf("%s", result);
>> > - }
>> > -
>> > --char *occupyMemory(uint size)
>> > -+char *occupyMemory(int size)
>> > - {
>> > -     char *buf = (char *)malloc(size * sizeof(char));
>> > -
>> > -
>> > -From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>> > -Date: Sat, 25 Jan 2020 09:20:48 +0100
>> > -Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include
>> header, now
>> > - glibc/musl wants poll.h being included directly. This fixes a build
>> failure
>> > - on musl systems with strict c hardening flags
>> > -
>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>> > ----
>> > - src/console/logstorage/dlt-logstorage-ctrl.c | 2 +-
>> > - src/daemon/dlt_daemon_event_handler.c        | 2 +-
>> > - src/daemon/dlt_daemon_event_handler.h        | 2 +-
>> > - src/daemon/dlt_daemon_event_handler_types.h  | 2 +-
>> > - src/lib/dlt_user.c                           | 2 +-
>> > - 5 files changed, 5 insertions(+), 5 deletions(-)
>> > -
>> > -diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c
>> b/src/console/logstorage/dlt-logstorage-ctrl.c
>> > -index 525c137..6614f44 100644
>> > ---- a/src/console/logstorage/dlt-logstorage-ctrl.c
>> > -+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
>> > -@@ -61,7 +61,7 @@
>> > - #include <string.h>
>> > - #include <getopt.h>
>> > -
>> > --#include <sys/poll.h>
>> > -+#include <poll.h>
>> > -
>> > - #if defined(__linux__)
>> > - #   include "sd-daemon.h"
>> > -diff --git a/src/daemon/dlt_daemon_event_handler.c
>> b/src/daemon/dlt_daemon_event_handler.c
>> > -index 1611f7b..0d463da 100644
>> > ---- a/src/daemon/dlt_daemon_event_handler.c
>> > -+++ b/src/daemon/dlt_daemon_event_handler.c
>> > -@@ -30,7 +30,7 @@
>> > - #include <string.h>
>> > - #include <errno.h>
>> > -
>> > --#include <sys/poll.h>
>> > -+#include <poll.h>
>> > - #include <syslog.h>
>> > -
>> > - #include "dlt_common.h"
>> > -diff --git a/src/daemon/dlt_daemon_event_handler.h
>> b/src/daemon/dlt_daemon_event_handler.h
>> > -index eb96101..bd550d3 100644
>> > ---- a/src/daemon/dlt_daemon_event_handler.h
>> > -+++ b/src/daemon/dlt_daemon_event_handler.h
>> > -@@ -25,7 +25,7 @@
>> > -  * \file dlt_daemon_event_handler.h
>> > -  */
>> > -
>> > --#include <sys/poll.h>
>> > -+#include <poll.h>
>> > -
>> > - #include "dlt_daemon_connection_types.h"
>> > - #include "dlt_daemon_event_handler_types.h"
>> > -diff --git a/src/daemon/dlt_daemon_event_handler_types.h
>> b/src/daemon/dlt_daemon_event_handler_types.h
>> > -index 370e503..0b16d08 100644
>> > ---- a/src/daemon/dlt_daemon_event_handler_types.h
>> > -+++ b/src/daemon/dlt_daemon_event_handler_types.h
>> > -@@ -25,7 +25,7 @@
>> > -  * \file dlt_daemon_event_handler_types.h
>> > -  */
>> > -
>> > --#include <sys/poll.h>
>> > -+#include <poll.h>
>> > -
>> > - #include "dlt_daemon_connection_types.h"
>> > -
>> > -#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
>> > -#index ffa9b09..511f991 100644
>> > -#--- a/src/lib/dlt_user.c
>> > -#+++ b/src/lib/dlt_user.c
>> > -#@@ -43,7 +43,7 @@
>> > -# #include <errno.h>
>> > -#
>> > -# #include <sys/uio.h> /* writev() */
>> > -#-#include <sys/poll.h>
>> > -#+#include <poll.h>
>> > -#
>> > -# #include <limits.h>
>> > -# #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 000000000..14c44e6ed
>> > --- /dev/null
>> > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
>> > @@ -0,0 +1,35 @@
>> > +From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
>> > +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>> > +Date: Fri, 31 Jul 2020 15:26:35 +0200
>> > +Subject: [PATCH] dlt_offline: fix build failures with gcc-10
>> > +
>> > +see bug report:
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
>> > +
>> > +/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
>> > +/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
>> > +/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
>> > +/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
>> > +/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
>> > +/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
>> > +/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
>> > +/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
>> > +---
>> > + src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
>> > + 1 file changed, 2 insertions(+), 2 deletions(-)
>> > +
>> > +diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h
>> b/src/offlinelogstorage/dlt_offline_logstorage.h
>> > +index b58da70..8ad84b8 100644
>> > +--- a/src/offlinelogstorage/dlt_offline_logstorage.h
>> > ++++ b/src/offlinelogstorage/dlt_offline_logstorage.h
>> > +@@ -114,9 +114,9 @@
>> > + #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s))
>> > +
>> > + /* logstorage max cache */
>> > +-unsigned int g_logstorage_cache_max;
>> > ++static unsigned int g_logstorage_cache_max;
>> > + /* current logstorage cache size */
>> > +-unsigned int g_logstorage_cache_size;
>> > ++static unsigned int g_logstorage_cache_size;
>> > +
>> > + typedef struct
>> > + {
>> > 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
>> > similarity index 97%
>> > rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb
>> > rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
>> > index 35c638bc7..3f5089672 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"
>> >  SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https
>> <http://github.com/GENIVI/$%7BBPN%7D.git;protocol=https> \
>> >      file://0002-Don-t-execute-processes-as-a-specific-user.patch \
>> >      file://0004-Modify-systemd-config-directory.patch \
>> > -    file://204.patch \
>> > +    file://238.patch \
>> >  "
>> > -SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4"
>> > +SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
>> >
>> >  S = "${WORKDIR}/git"
>> >
>> > --
>> > 2.17.1
>> >
>> > 
>>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#86111): https://lists.openembedded.org/g/openembedded-devel/message/86111
Mute This Topic: https://lists.openembedded.org/mt/75908501/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Gianfranco Costamagna Aug. 3, 2020, 8:05 a.m.
Reproduced with systemd enabled.
Will craft a patch and resubmit next week also upstream

G.

On Mon, Aug 3, 2020, 04:00 Khem Raj <raj.khem@gmail.com> wrote:

>
>
> On Sun, Aug 2, 2020 at 3:05 PM Gianfranco Costamagna <
> costamagna.gianfranco@gmail.com> wrote:
>
>> Hello
>>
>> I tried to reproduce by running everything on master (master-next for
>> meta-oe) and bitbake dlt-daemon with MACHINE set to raspberrypi4 or qemux86
>> and DISTRO=poky-tiny.
>> I also tried with and without systemd.
>>
>> It builds just fine.
>> Do you have a way to share bblayers.conf and local.conf files please?
>>
>
> It’s perhaps revealed with glibc upgrade patch that I have staged in
> yoe/mut branch on yoe distro I will look a bit as well
>
>
>> Thanks
>>
>> Gianfranco
>>
>> On Sun, Aug 2, 2020, 09:01 Khem Raj <raj.khem@gmail.com> wrote:
>>
>>> This fails on musl
>>>
>>> http://errors.yoctoproject.org/Errors/Details/427081/
>>>
>>> On Fri, Jul 31, 2020 at 7:43 AM Gianfranco
>>> <costamagna.gianfranco@gmail.com> wrote:
>>> >
>>> >  - drop patch 204: upstream
>>> >  - add gcc-10 build fix proposed upstream 238.patch
>>> >
>>> > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>> > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>>> > ---
>>> >  .../dlt-daemon/dlt-daemon/204.patch           | 148 ------------------
>>> >  .../dlt-daemon/dlt-daemon/238.patch           |  35 +++++
>>> >  ...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} |   4 +-
>>> >  3 files changed, 37 insertions(+), 150 deletions(-)
>>> >  delete mode 100644
>>> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>>> >  create mode 100644
>>> meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
>>> >  rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb =>
>>> dlt-daemon_2.18.5.bb} (97%)
>>> >
>>> > 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 f0fc0bcb2..000000000
>>> > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>>> > +++ /dev/null
>>> > @@ -1,148 +0,0 @@
>>> > -Upstream-Status: Submitted [
>>> https://github.com/GENIVI/dlt-daemon/pull/204]
>>> > -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
>>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>> > -Date: Sat, 25 Jan 2020 09:08:07 +0100
>>> > -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
>>> > - implementation, by adding a missing include for pthread_t reference:
>>> > -
>>> > -see https://errors.yoctoproject.org/Errors/Details/308000/ for
>>> details
>>> > -
>>> > -Thanks Khem Raj <raj.khem@gmail.com> for the report
>>> > -
>>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>>> > ----
>>> > - include/dlt/dlt_user.h | 1 +
>>> > - 1 file changed, 1 insertion(+)
>>> > -
>>> > -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
>>> > -index 69cb854..766d349 100644
>>> > ---- a/include/dlt/dlt_user.h
>>> > -+++ b/include/dlt/dlt_user.h
>>> > -@@ -74,6 +74,7 @@
>>> > -  \{
>>> > -  */
>>> > - #   include <mqueue.h>
>>> > -+#   include <pthread.h>
>>> > -
>>> > - #   if !defined (__WIN32__)
>>> > - #      include <semaphore.h>
>>> > -
>>> > -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
>>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>> > -Date: Sat, 25 Jan 2020 09:16:14 +0100
>>> > -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
>>> > - compiler flags, due to uint being undefined. This is actually an
>>> "int" type,
>>> > - looking at the test implementation
>>> > -
>>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>>> > ----
>>> > - src/tests/dlt-test-init-free.c | 4 ++--
>>> > - 1 file changed, 2 insertions(+), 2 deletions(-)
>>> > -
>>> > -diff --git a/src/tests/dlt-test-init-free.c
>>> b/src/tests/dlt-test-init-free.c
>>> > -index 96b5245..35b8803 100644
>>> > ---- a/src/tests/dlt-test-init-free.c
>>> > -+++ b/src/tests/dlt-test-init-free.c
>>> > -@@ -32,7 +32,7 @@
>>> > -
>>> > - void exec(const char *cmd, char *buffer, size_t length);
>>> > - void printMemoryUsage();
>>> > --char *occupyMemory(uint size);
>>> > -+char *occupyMemory(int size);
>>> > - void do_example_test();
>>> > - void do_dlt_test();
>>> > -
>>> > -@@ -131,7 +131,7 @@ void printMemoryUsage()
>>> > -     printf("%s", result);
>>> > - }
>>> > -
>>> > --char *occupyMemory(uint size)
>>> > -+char *occupyMemory(int size)
>>> > - {
>>> > -     char *buf = (char *)malloc(size * sizeof(char));
>>> > -
>>> > -
>>> > -From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
>>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>> > -Date: Sat, 25 Jan 2020 09:20:48 +0100
>>> > -Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include
>>> header, now
>>> > - glibc/musl wants poll.h being included directly. This fixes a build
>>> failure
>>> > - on musl systems with strict c hardening flags
>>> > -
>>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>>> > ----
>>> > - src/console/logstorage/dlt-logstorage-ctrl.c | 2 +-
>>> > - src/daemon/dlt_daemon_event_handler.c        | 2 +-
>>> > - src/daemon/dlt_daemon_event_handler.h        | 2 +-
>>> > - src/daemon/dlt_daemon_event_handler_types.h  | 2 +-
>>> > - src/lib/dlt_user.c                           | 2 +-
>>> > - 5 files changed, 5 insertions(+), 5 deletions(-)
>>> > -
>>> > -diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c
>>> b/src/console/logstorage/dlt-logstorage-ctrl.c
>>> > -index 525c137..6614f44 100644
>>> > ---- a/src/console/logstorage/dlt-logstorage-ctrl.c
>>> > -+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
>>> > -@@ -61,7 +61,7 @@
>>> > - #include <string.h>
>>> > - #include <getopt.h>
>>> > -
>>> > --#include <sys/poll.h>
>>> > -+#include <poll.h>
>>> > -
>>> > - #if defined(__linux__)
>>> > - #   include "sd-daemon.h"
>>> > -diff --git a/src/daemon/dlt_daemon_event_handler.c
>>> b/src/daemon/dlt_daemon_event_handler.c
>>> > -index 1611f7b..0d463da 100644
>>> > ---- a/src/daemon/dlt_daemon_event_handler.c
>>> > -+++ b/src/daemon/dlt_daemon_event_handler.c
>>> > -@@ -30,7 +30,7 @@
>>> > - #include <string.h>
>>> > - #include <errno.h>
>>> > -
>>> > --#include <sys/poll.h>
>>> > -+#include <poll.h>
>>> > - #include <syslog.h>
>>> > -
>>> > - #include "dlt_common.h"
>>> > -diff --git a/src/daemon/dlt_daemon_event_handler.h
>>> b/src/daemon/dlt_daemon_event_handler.h
>>> > -index eb96101..bd550d3 100644
>>> > ---- a/src/daemon/dlt_daemon_event_handler.h
>>> > -+++ b/src/daemon/dlt_daemon_event_handler.h
>>> > -@@ -25,7 +25,7 @@
>>> > -  * \file dlt_daemon_event_handler.h
>>> > -  */
>>> > -
>>> > --#include <sys/poll.h>
>>> > -+#include <poll.h>
>>> > -
>>> > - #include "dlt_daemon_connection_types.h"
>>> > - #include "dlt_daemon_event_handler_types.h"
>>> > -diff --git a/src/daemon/dlt_daemon_event_handler_types.h
>>> b/src/daemon/dlt_daemon_event_handler_types.h
>>> > -index 370e503..0b16d08 100644
>>> > ---- a/src/daemon/dlt_daemon_event_handler_types.h
>>> > -+++ b/src/daemon/dlt_daemon_event_handler_types.h
>>> > -@@ -25,7 +25,7 @@
>>> > -  * \file dlt_daemon_event_handler_types.h
>>> > -  */
>>> > -
>>> > --#include <sys/poll.h>
>>> > -+#include <poll.h>
>>> > -
>>> > - #include "dlt_daemon_connection_types.h"
>>> > -
>>> > -#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
>>> > -#index ffa9b09..511f991 100644
>>> > -#--- a/src/lib/dlt_user.c
>>> > -#+++ b/src/lib/dlt_user.c
>>> > -#@@ -43,7 +43,7 @@
>>> > -# #include <errno.h>
>>> > -#
>>> > -# #include <sys/uio.h> /* writev() */
>>> > -#-#include <sys/poll.h>
>>> > -#+#include <poll.h>
>>> > -#
>>> > -# #include <limits.h>
>>> > -# #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 000000000..14c44e6ed
>>> > --- /dev/null
>>> > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
>>> > @@ -0,0 +1,35 @@
>>> > +From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
>>> > +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>> > +Date: Fri, 31 Jul 2020 15:26:35 +0200
>>> > +Subject: [PATCH] dlt_offline: fix build failures with gcc-10
>>> > +
>>> > +see bug report:
>>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
>>> > +
>>> > +/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
>>> > +/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
>>> > +/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
>>> > +/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
>>> > +/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
>>> > +/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
>>> > +/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
>>> > +/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
>>> > +---
>>> > + src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
>>> > + 1 file changed, 2 insertions(+), 2 deletions(-)
>>> > +
>>> > +diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h
>>> b/src/offlinelogstorage/dlt_offline_logstorage.h
>>> > +index b58da70..8ad84b8 100644
>>> > +--- a/src/offlinelogstorage/dlt_offline_logstorage.h
>>> > ++++ b/src/offlinelogstorage/dlt_offline_logstorage.h
>>> > +@@ -114,9 +114,9 @@
>>> > + #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s))
>>> > +
>>> > + /* logstorage max cache */
>>> > +-unsigned int g_logstorage_cache_max;
>>> > ++static unsigned int g_logstorage_cache_max;
>>> > + /* current logstorage cache size */
>>> > +-unsigned int g_logstorage_cache_size;
>>> > ++static unsigned int g_logstorage_cache_size;
>>> > +
>>> > + typedef struct
>>> > + {
>>> > 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
>>> > similarity index 97%
>>> > rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb
>>> > rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
>>> > index 35c638bc7..3f5089672 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"
>>> >  SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https
>>> <http://github.com/GENIVI/$%7BBPN%7D.git;protocol=https> \
>>> >      file://0002-Don-t-execute-processes-as-a-specific-user.patch \
>>> >      file://0004-Modify-systemd-config-directory.patch \
>>> > -    file://204.patch \
>>> > +    file://238.patch \
>>> >  "
>>> > -SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4"
>>> > +SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
>>> >
>>> >  S = "${WORKDIR}/git"
>>> >
>>> > --
>>> > 2.17.1
>>> >
>>> > 
>>>
>>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#86114): https://lists.openembedded.org/g/openembedded-devel/message/86114
Mute This Topic: https://lists.openembedded.org/mt/75908501/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Khem Raj Aug. 4, 2020, 10:39 p.m.
btw. there is also a build error with musl
http://errors.yoctoproject.org/Errors/Details/428487/

you can reproduce it with TCLIBC=musl MACHINE=qemuarm bitbake dlt-daemon

On Mon, Aug 3, 2020 at 1:06 AM Gianfranco Costamagna
<costamagna.gianfranco@gmail.com> wrote:
>
> Reproduced with systemd enabled.
> Will craft a patch and resubmit next week also upstream
>
> G.
>
> On Mon, Aug 3, 2020, 04:00 Khem Raj <raj.khem@gmail.com> wrote:
>>
>>
>>
>> On Sun, Aug 2, 2020 at 3:05 PM Gianfranco Costamagna <costamagna.gianfranco@gmail.com> wrote:
>>>
>>> Hello
>>>
>>> I tried to reproduce by running everything on master (master-next for meta-oe) and bitbake dlt-daemon with MACHINE set to raspberrypi4 or qemux86 and DISTRO=poky-tiny.
>>> I also tried with and without systemd.
>>>
>>> It builds just fine.
>>> Do you have a way to share bblayers.conf and local.conf files please?
>>
>>
>> It’s perhaps revealed with glibc upgrade patch that I have staged in yoe/mut branch on yoe distro I will look a bit as well
>>
>>>
>>> Thanks
>>>
>>> Gianfranco
>>>
>>> On Sun, Aug 2, 2020, 09:01 Khem Raj <raj.khem@gmail.com> wrote:
>>>>
>>>> This fails on musl
>>>>
>>>> http://errors.yoctoproject.org/Errors/Details/427081/
>>>>
>>>> On Fri, Jul 31, 2020 at 7:43 AM Gianfranco
>>>> <costamagna.gianfranco@gmail.com> wrote:
>>>> >
>>>> >  - drop patch 204: upstream
>>>> >  - add gcc-10 build fix proposed upstream 238.patch
>>>> >
>>>> > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>>> > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>>>> > ---
>>>> >  .../dlt-daemon/dlt-daemon/204.patch           | 148 ------------------
>>>> >  .../dlt-daemon/dlt-daemon/238.patch           |  35 +++++
>>>> >  ...-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} |   4 +-
>>>> >  3 files changed, 37 insertions(+), 150 deletions(-)
>>>> >  delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>>>> >  create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
>>>> >  rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.4.bb => dlt-daemon_2.18.5.bb} (97%)
>>>> >
>>>> > 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 f0fc0bcb2..000000000
>>>> > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch
>>>> > +++ /dev/null
>>>> > @@ -1,148 +0,0 @@
>>>> > -Upstream-Status: Submitted [https://github.com/GENIVI/dlt-daemon/pull/204]
>>>> > -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001
>>>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>>> > -Date: Sat, 25 Jan 2020 09:08:07 +0100
>>>> > -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc
>>>> > - implementation, by adding a missing include for pthread_t reference:
>>>> > -
>>>> > -see https://errors.yoctoproject.org/Errors/Details/308000/ for details
>>>> > -
>>>> > -Thanks Khem Raj <raj.khem@gmail.com> for the report
>>>> > -
>>>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>>>> > ----
>>>> > - include/dlt/dlt_user.h | 1 +
>>>> > - 1 file changed, 1 insertion(+)
>>>> > -
>>>> > -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
>>>> > -index 69cb854..766d349 100644
>>>> > ---- a/include/dlt/dlt_user.h
>>>> > -+++ b/include/dlt/dlt_user.h
>>>> > -@@ -74,6 +74,7 @@
>>>> > -  \{
>>>> > -  */
>>>> > - #   include <mqueue.h>
>>>> > -+#   include <pthread.h>
>>>> > -
>>>> > - #   if !defined (__WIN32__)
>>>> > - #      include <semaphore.h>
>>>> > -
>>>> > -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001
>>>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>>> > -Date: Sat, 25 Jan 2020 09:16:14 +0100
>>>> > -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict
>>>> > - compiler flags, due to uint being undefined. This is actually an "int" type,
>>>> > - looking at the test implementation
>>>> > -
>>>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>>>> > ----
>>>> > - src/tests/dlt-test-init-free.c | 4 ++--
>>>> > - 1 file changed, 2 insertions(+), 2 deletions(-)
>>>> > -
>>>> > -diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c
>>>> > -index 96b5245..35b8803 100644
>>>> > ---- a/src/tests/dlt-test-init-free.c
>>>> > -+++ b/src/tests/dlt-test-init-free.c
>>>> > -@@ -32,7 +32,7 @@
>>>> > -
>>>> > - void exec(const char *cmd, char *buffer, size_t length);
>>>> > - void printMemoryUsage();
>>>> > --char *occupyMemory(uint size);
>>>> > -+char *occupyMemory(int size);
>>>> > - void do_example_test();
>>>> > - void do_dlt_test();
>>>> > -
>>>> > -@@ -131,7 +131,7 @@ void printMemoryUsage()
>>>> > -     printf("%s", result);
>>>> > - }
>>>> > -
>>>> > --char *occupyMemory(uint size)
>>>> > -+char *occupyMemory(int size)
>>>> > - {
>>>> > -     char *buf = (char *)malloc(size * sizeof(char));
>>>> > -
>>>> > -
>>>> > -From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001
>>>> > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>>> > -Date: Sat, 25 Jan 2020 09:20:48 +0100
>>>> > -Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include header, now
>>>> > - glibc/musl wants poll.h being included directly. This fixes a build failure
>>>> > - on musl systems with strict c hardening flags
>>>> > -
>>>> > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>>> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>>>> > ----
>>>> > - src/console/logstorage/dlt-logstorage-ctrl.c | 2 +-
>>>> > - src/daemon/dlt_daemon_event_handler.c        | 2 +-
>>>> > - src/daemon/dlt_daemon_event_handler.h        | 2 +-
>>>> > - src/daemon/dlt_daemon_event_handler_types.h  | 2 +-
>>>> > - src/lib/dlt_user.c                           | 2 +-
>>>> > - 5 files changed, 5 insertions(+), 5 deletions(-)
>>>> > -
>>>> > -diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c b/src/console/logstorage/dlt-logstorage-ctrl.c
>>>> > -index 525c137..6614f44 100644
>>>> > ---- a/src/console/logstorage/dlt-logstorage-ctrl.c
>>>> > -+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
>>>> > -@@ -61,7 +61,7 @@
>>>> > - #include <string.h>
>>>> > - #include <getopt.h>
>>>> > -
>>>> > --#include <sys/poll.h>
>>>> > -+#include <poll.h>
>>>> > -
>>>> > - #if defined(__linux__)
>>>> > - #   include "sd-daemon.h"
>>>> > -diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c
>>>> > -index 1611f7b..0d463da 100644
>>>> > ---- a/src/daemon/dlt_daemon_event_handler.c
>>>> > -+++ b/src/daemon/dlt_daemon_event_handler.c
>>>> > -@@ -30,7 +30,7 @@
>>>> > - #include <string.h>
>>>> > - #include <errno.h>
>>>> > -
>>>> > --#include <sys/poll.h>
>>>> > -+#include <poll.h>
>>>> > - #include <syslog.h>
>>>> > -
>>>> > - #include "dlt_common.h"
>>>> > -diff --git a/src/daemon/dlt_daemon_event_handler.h b/src/daemon/dlt_daemon_event_handler.h
>>>> > -index eb96101..bd550d3 100644
>>>> > ---- a/src/daemon/dlt_daemon_event_handler.h
>>>> > -+++ b/src/daemon/dlt_daemon_event_handler.h
>>>> > -@@ -25,7 +25,7 @@
>>>> > -  * \file dlt_daemon_event_handler.h
>>>> > -  */
>>>> > -
>>>> > --#include <sys/poll.h>
>>>> > -+#include <poll.h>
>>>> > -
>>>> > - #include "dlt_daemon_connection_types.h"
>>>> > - #include "dlt_daemon_event_handler_types.h"
>>>> > -diff --git a/src/daemon/dlt_daemon_event_handler_types.h b/src/daemon/dlt_daemon_event_handler_types.h
>>>> > -index 370e503..0b16d08 100644
>>>> > ---- a/src/daemon/dlt_daemon_event_handler_types.h
>>>> > -+++ b/src/daemon/dlt_daemon_event_handler_types.h
>>>> > -@@ -25,7 +25,7 @@
>>>> > -  * \file dlt_daemon_event_handler_types.h
>>>> > -  */
>>>> > -
>>>> > --#include <sys/poll.h>
>>>> > -+#include <poll.h>
>>>> > -
>>>> > - #include "dlt_daemon_connection_types.h"
>>>> > -
>>>> > -#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
>>>> > -#index ffa9b09..511f991 100644
>>>> > -#--- a/src/lib/dlt_user.c
>>>> > -#+++ b/src/lib/dlt_user.c
>>>> > -#@@ -43,7 +43,7 @@
>>>> > -# #include <errno.h>
>>>> > -#
>>>> > -# #include <sys/uio.h> /* writev() */
>>>> > -#-#include <sys/poll.h>
>>>> > -#+#include <poll.h>
>>>> > -#
>>>> > -# #include <limits.h>
>>>> > -# #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 000000000..14c44e6ed
>>>> > --- /dev/null
>>>> > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch
>>>> > @@ -0,0 +1,35 @@
>>>> > +From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
>>>> > +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
>>>> > +Date: Fri, 31 Jul 2020 15:26:35 +0200
>>>> > +Subject: [PATCH] dlt_offline: fix build failures with gcc-10
>>>> > +
>>>> > +see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
>>>> > +
>>>> > +/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
>>>> > +/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
>>>> > +/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
>>>> > +/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
>>>> > +/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
>>>> > +/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
>>>> > +/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
>>>> > +/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
>>>> > +---
>>>> > + src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
>>>> > + 1 file changed, 2 insertions(+), 2 deletions(-)
>>>> > +
>>>> > +diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h
>>>> > +index b58da70..8ad84b8 100644
>>>> > +--- a/src/offlinelogstorage/dlt_offline_logstorage.h
>>>> > ++++ b/src/offlinelogstorage/dlt_offline_logstorage.h
>>>> > +@@ -114,9 +114,9 @@
>>>> > + #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s))
>>>> > +
>>>> > + /* logstorage max cache */
>>>> > +-unsigned int g_logstorage_cache_max;
>>>> > ++static unsigned int g_logstorage_cache_max;
>>>> > + /* current logstorage cache size */
>>>> > +-unsigned int g_logstorage_cache_size;
>>>> > ++static unsigned int g_logstorage_cache_size;
>>>> > +
>>>> > + typedef struct
>>>> > + {
>>>> > 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
>>>> > similarity index 97%
>>>> > rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb
>>>> > rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
>>>> > index 35c638bc7..3f5089672 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"
>>>> >  SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
>>>> >      file://0002-Don-t-execute-processes-as-a-specific-user.patch \
>>>> >      file://0004-Modify-systemd-config-directory.patch \
>>>> > -    file://204.patch \
>>>> > +    file://238.patch \
>>>> >  "
>>>> > -SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4"
>>>> > +SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
>>>> >
>>>> >  S = "${WORKDIR}/git"
>>>> >
>>>> > --
>>>> > 2.17.1
>>>> >
>>>> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#86155): https://lists.openembedded.org/g/openembedded-devel/message/86155
Mute This Topic: https://lists.openembedded.org/mt/75908501/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-