CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dlt-daemon: superseed upstream pr #238 patch with pr #245 due to unexpected behaviour

Browse Source 
Upstream commented to use the second one

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gianfranco Costamagna 2020-08-29 10:00:38 +02:00 committed by Khem Raj
parent ffe9fa02bb
commit c32d2eb448
2 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch → meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
View File

@ -1,6 +1,6 @@
From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001
From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Fri, 31 Jul 2020 15:26:35 +0200
Date: Fri, 31 Jul 2020 15:16:02 +0200
Subject: [PATCH] dlt_offline: fix build failures with gcc-10
see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
@ -14,11 +14,26 @@ see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
/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(-)
src/daemon/dlt_daemon_offline_logstorage.c | 1 +
src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++--
src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 1 +
tests/gtest_dlt_daemon_offline_log.cpp | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/daemon/dlt_daemon_offline_logstorage.c b/src/daemon/dlt_daemon_offline_logstorage.c
index 0b3c14f..db9637e 100644
--- a/src/daemon/dlt_daemon_offline_logstorage.c
+++ b/src/daemon/dlt_daemon_offline_logstorage.c
@@ -56,6 +56,7 @@ DLT_STATIC DltReturnValue dlt_logstorage_split_ecuid(char *key,
return DLT_RETURN_OK;
}
+unsigned int g_logstorage_cache_max;
/**
* dlt_logstorage_split_ctid
*
diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h
index b58da70..8ad84b8 100644
index b58da70..c9bc93b 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage.h
+++ b/src/offlinelogstorage/dlt_offline_logstorage.h
@@ -114,9 +114,9 @@
@ -26,10 +41,34 @@ index b58da70..8ad84b8 100644
/* logstorage max cache */
-unsigned int g_logstorage_cache_max;
+static unsigned int g_logstorage_cache_max;
+extern unsigned int g_logstorage_cache_max;
/* current logstorage cache size */
-unsigned int g_logstorage_cache_size;
+static unsigned int g_logstorage_cache_size;
+extern unsigned int g_logstorage_cache_size;
typedef struct
{
diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
index afbf8c4..edef482 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
@@ -32,6 +32,7 @@
#include "dlt_offline_logstorage_behavior.h"
#include "dlt_offline_logstorage_behavior_internal.h"
+unsigned int g_logstorage_cache_size;
/**
* dlt_logstorage_log_file_name
*
diff --git a/tests/gtest_dlt_daemon_offline_log.cpp b/tests/gtest_dlt_daemon_offline_log.cpp
index b8965de..0bd4d5e 100644
--- a/tests/gtest_dlt_daemon_offline_log.cpp
+++ b/tests/gtest_dlt_daemon_offline_log.cpp
@@ -29,6 +29,7 @@ extern "C"
#include <fcntl.h>
}
+unsigned int g_logstorage_cache_max;
/* Begin Method: dlt_logstorage::t_dlt_logstorage_list_add*/
TEST(t_dlt_logstorage_list_add, normal)
{

2
meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
View File

@ -17,8 +17,8 @@ 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://238.patch \
file://241.patch \
file://245.patch \
"
SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"