diff options
author | Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2023-08-17 09:59:36 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-08-17 16:54:40 -0700 |
commit | 345d000bab7953c27f3d3e5c256540cf5e4ce0ef (patch) | |
tree | f1d4c0a364644719bb9ce0409525d8be5d71a47d | |
parent | 4cfdfa16f2491708142fc7d0ec58a4ec67fa1996 (diff) | |
download | meta-openembedded-345d000bab7953c27f3d3e5c256540cf5e4ce0ef.tar.gz |
dlt-daemon: upgrade 2.18.9 -> 2.18.10 (commit: 0f2d4cfffada6f8448a2cb27995b38eb4271044f)
Drop patches now part of new upstream release:
- 449.patch
- 481.patch
- 482.patch
Refresh patches due to GENIVI->COVESA renaming
What's Changed:
Update ReleaseNotes and version to v2.18.9 by @minminlittleshrimp in #468
Update status badges on README.md by @michael-methner in #467
logstorage: Adds option to write logs in gzip format by @LiquidityC in #442
Re-Initialize internal logging in daemon mode only by @lvklevankhanh in #459
Remove use of DLT_LOG in signal handler by @michael-methner in #472
Update gtest_dlt_daemon_multiple_files_logging.cpp by @LocutusOfBorg in #481
Update AUTOSAR standard link by @lucafrance in #480
cmake: set version to 2.18.9 by @alexmohr in #478
Fix macro code to use boolean value in while instruction (false) by @michael-methner in #469
dlt_user_shared: Add timeout to writev by @alexmohr in #385
build: add static lib only if necessary by @alexmohr in #479
Update CMakeLists.txt by @LocutusOfBorg in #482
watchdog: improve dlt watchdog by @alexmohr in #470
log-level-config: add option to configure log levels by @alexmohr in #474
gtest_dlt_daemon_gateway: dlt-daemon run without dlt_passive.conf file by @lti9hc in #487
dlt_unit_test: Fix and improve quality of unit tests by @minminlittleshrimp in #494
dlt-qnx-system improvement by @lvklevankhanh in #495
gtest: Init submodule and update version by @minminlittleshrimp in #497
dlt-qnx-system: prevent message loss in high load situations by @alexmohr in #490
Fix compile error stringop-truncation with GCC 9.4 by @michael-methner in #499
Update README.md by @lvklevankhanh in #503
dlt-coverage: Add coverage report generator for dlt by @minminlittleshrimp in #501
dlt-system: move journal reading to its own thread by @alexmohr in #471
Switch from GENIVI to COVESA by @minminlittleshrimp in #511
Update CMakeLists.txt: set required std version to gnu++14 by @LocutusOfBorg in #504
cmake: Policy CMP0115 set to OLD behavior for dlt-daemon with cmake >= 3.20 by @minminlittleshrimp in #510
fix usage of pthread_cond_timedwait by @alexmohr in #491
DLT Upstream for minor release by @minminlittleshrimp in #515
cmake: disable network trace by @alexmohr in #477
doc: add COVESA logo image by @minminlittleshrimp in #516
Prepare for 2.18.10 release by @michael-methner in #517
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>
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch | 10 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch | 49 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch | 34 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb (renamed from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb) | 7 |
5 files changed, 7 insertions, 133 deletions
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch index 181be25c7..cfb820cec 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch | |||
@@ -18,7 +18,7 @@ diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.ser | |||
18 | index 8dac1f2..ecf9f9e 100644 | 18 | index 8dac1f2..ecf9f9e 100644 |
19 | --- a/systemd/dlt-adaptor-udp.service.cmake | 19 | --- a/systemd/dlt-adaptor-udp.service.cmake |
20 | +++ b/systemd/dlt-adaptor-udp.service.cmake | 20 | +++ b/systemd/dlt-adaptor-udp.service.cmake |
21 | @@ -21,9 +21,8 @@ Wants=dlt.service | 21 | @@ -19,9 +19,8 @@ Wants=dlt.service |
22 | 22 | ||
23 | [Service] | 23 | [Service] |
24 | Type=simple | 24 | Type=simple |
@@ -51,7 +51,7 @@ index b665742..35009b0 100644 | |||
51 | [Service] | 51 | [Service] |
52 | Type=simple | 52 | Type=simple |
53 | -User=@DLT_USER@ | 53 | -User=@DLT_USER@ |
54 | ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" | 54 | ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from COVESA DLT example user application" |
55 | -LimitCORE=infinity | 55 | -LimitCORE=infinity |
56 | \ No newline at end of file | 56 | \ No newline at end of file |
57 | +LimitCORE=infinity | 57 | +LimitCORE=infinity |
@@ -59,7 +59,7 @@ diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cma | |||
59 | index c07d447..8f88f00 100644 | 59 | index c07d447..8f88f00 100644 |
60 | --- a/systemd/dlt-receive.service.cmake | 60 | --- a/systemd/dlt-receive.service.cmake |
61 | +++ b/systemd/dlt-receive.service.cmake | 61 | +++ b/systemd/dlt-receive.service.cmake |
62 | @@ -22,6 +22,5 @@ Wants=dlt.service | 62 | @@ -20,6 +20,5 @@ Wants=dlt.service |
63 | 63 | ||
64 | [Service] | 64 | [Service] |
65 | Type=simple | 65 | Type=simple |
@@ -72,7 +72,7 @@ diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake | |||
72 | index 0e91f42..1a5b913 100755 | 72 | index 0e91f42..1a5b913 100755 |
73 | --- a/systemd/dlt-system.service.cmake | 73 | --- a/systemd/dlt-system.service.cmake |
74 | +++ b/systemd/dlt-system.service.cmake | 74 | +++ b/systemd/dlt-system.service.cmake |
75 | @@ -22,7 +22,6 @@ Wants=dlt.service | 75 | @@ -20,7 +20,6 @@ Wants=dlt.service |
76 | 76 | ||
77 | [Service] | 77 | [Service] |
78 | Type=simple | 78 | Type=simple |
@@ -84,7 +84,7 @@ diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake | |||
84 | index 0b3ee2c..e4753a2 100755 | 84 | index 0b3ee2c..e4753a2 100755 |
85 | --- a/systemd/dlt.service.cmake | 85 | --- a/systemd/dlt.service.cmake |
86 | +++ b/systemd/dlt.service.cmake | 86 | +++ b/systemd/dlt.service.cmake |
87 | @@ -21,7 +21,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) | 87 | @@ -19,7 +19,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) |
88 | 88 | ||
89 | [Service] | 89 | [Service] |
90 | Type=simple | 90 | Type=simple |
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch deleted file mode 100644 index 52d9de2fd..000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 95476de802585629c6d89707a9247bbb0c70f6c9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | ||
3 | Date: Fri, 28 Apr 2023 22:39:57 +0200 | ||
4 | Subject: [PATCH] Update gtest_dlt_daemon_multiple_files_logging.cpp | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Fix build error due to dlt_vlog not having the correct format string with security build flags enabled | ||
10 | |||
11 | [ 88%] Building CXX object tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o | ||
12 | cd dlt-daemon-2.18.9/obj-x86_64-linux-gnu/tests && /usr/bin/c++ -DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC -DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE -DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\" -DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -Idlt-daemon-2.18.9 -Idlt-daemon-2.18.9/obj-x86_64-linux-gnu/include/dlt -Idlt-daemon-2.18.9/include/dlt -Idlt-daemon-2.18.9/src/shared -Idlt-daemon-2.18.9/src/core_dump_handler -Idlt-daemon-2.18.9/src/offlinelogstorage -Idlt-daemon-2.18.9/src/lib -Idlt-daemon-2.18.9/src/daemon -Idlt-daemon-2.18.9/src/console -Idlt-daemon-2.18.9/src/gateway -Idlt-daemon-2.18.9/systemd/3rdparty -g -O2 -ffile-prefix-map=dlt-daemon-2.18.9=. -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -isystem /include -std=gnu++0x -std=gnu++11 -Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -DGTEST_HAS_PTHREAD=1 -MD -MT tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o -MF CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o.d -o CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o -c dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp | ||
13 | dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp: In member function ‘virtual void t_dlt_logging_multiple_files_append_reinit_normal_Test::TestBody()’: | ||
14 | dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:106:13: error: format not a string literal and no format arguments [-Werror=format-security] | ||
15 | 106 | dlt_vlog(LOG_INFO, log1); | ||
16 | | ~~~~~~~~^~~~~~~~~~~~~~~~ | ||
17 | dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:110:13: error: format not a string literal and no format arguments [-Werror=format-security] | ||
18 | 110 | dlt_vlog(LOG_INFO, log2); | ||
19 | | ~~~~~~~~^~~~~~~~~~~~~~~~ | ||
20 | In file included from /usr/include/string.h:535, | ||
21 | from /usr/include/gtest/internal/gtest-port.h:264, | ||
22 | from /usr/include/gtest/internal/gtest-internal.h:40, | ||
23 | from /usr/include/gtest/gtest.h:62, | ||
24 | from dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:27: | ||
25 | In function ‘strncpy’, | ||
26 | --- | ||
27 | Upstream-Status: Pending | ||
28 | |||
29 | tests/gtest_dlt_daemon_multiple_files_logging.cpp | 4 ++-- | ||
30 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
31 | |||
32 | diff --git a/tests/gtest_dlt_daemon_multiple_files_logging.cpp b/tests/gtest_dlt_daemon_multiple_files_logging.cpp | ||
33 | index 2da512e1..05b58f2c 100644 | ||
34 | --- a/tests/gtest_dlt_daemon_multiple_files_logging.cpp | ||
35 | +++ b/tests/gtest_dlt_daemon_multiple_files_logging.cpp | ||
36 | @@ -103,11 +103,11 @@ TEST(t_dlt_logging_multiple_files_append_reinit, normal) | ||
37 | const char* log2 = "TWO\n"; | ||
38 | |||
39 | configure(path, file_name, true, file_size, max_file_size); | ||
40 | - dlt_vlog(LOG_INFO, log1); | ||
41 | + dlt_vlog(LOG_INFO, "%s", log1); | ||
42 | EXPECT_NO_THROW(dlt_log_free()); | ||
43 | |||
44 | configure(path, file_name, true, file_size, max_file_size); | ||
45 | - dlt_vlog(LOG_INFO, log2); | ||
46 | + dlt_vlog(LOG_INFO, "%s", log2); | ||
47 | EXPECT_NO_THROW(dlt_log_free()); | ||
48 | verify_in_one_file(path, file_name, log1, log2); | ||
49 | } | ||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch deleted file mode 100644 index 7c9e222b3..000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From b38761831670e980a58acb33d611f65255d678ac Mon Sep 17 00:00:00 2001 | ||
2 | From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | ||
3 | Date: Fri, 28 Apr 2023 22:46:36 +0200 | ||
4 | Subject: [PATCH] Update CMakeLists.txt | ||
5 | |||
6 | Link systemd libraries, to avoid underlinking of tests with | ||
7 | -DWITH_SYSTEMD_SOCKET_ACTIVATION=ON | ||
8 | |||
9 | [ 82%] Linking CXX executable gtest_dlt_daemon_gateway | ||
10 | cd dlt-daemon-2.18.9/obj-x86_64-linux-gnu/tests && /usr/bin/cmake -E cmake_link_script CMakeFiles/gtest_dlt_daemon_gateway.dir/link.txt --verbose=1 | ||
11 | /usr/bin/c++ -g -O2 -ffile-prefix-map=dlt-daemon-2.18.9=. -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -isystem /include -std=gnu++0x -Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -flto=auto -Wl,-z,relro -rdynamic CMakeFiles/gtest_dlt_daemon_gateway.dir/gtest_dlt_daemon_gateway.cpp.o CMakeFiles/gtest_dlt_daemon_gateway.dir/__/systemd/3rdparty/sd-daemon.c.o -o gtest_dlt_daemon_gateway -Wl,-rpath,dlt-daemon-2.18.9/obj-x86_64-linux-gnu/src/daemon ../src/daemon/libdlt_daemon.so /usr/lib/x86_64-linux-gnu/libgtest.a /usr/lib/x86_64-linux-gnu/libgtest_main.a -lrt /usr/lib/x86_64-linux-gnu/libgtest.a | ||
12 | /usr/bin/ld: ../src/daemon/libdlt_daemon.so: undefined reference to `sd_listen_fds_with_names' | ||
13 | --- | ||
14 | Upstream-Status: Pending | ||
15 | |||
16 | tests/CMakeLists.txt | 10 +++++++++- | ||
17 | 1 file changed, 9 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
20 | index 579d7308..3155ca9a 100644 | ||
21 | --- a/tests/CMakeLists.txt | ||
22 | +++ b/tests/CMakeLists.txt | ||
23 | @@ -21,8 +21,16 @@ else() | ||
24 | set(LIBRARIES socket) | ||
25 | endif() | ||
26 | |||
27 | +if(WITH_SYSTEMD_JOURNAL) | ||
28 | + if(SYSTEMD_VERSION LESS 209) | ||
29 | + set(SYSTEMD_LIBS systemd-journal systemd-id128) | ||
30 | + else(SYSTEMD_VERSION LESS 209) | ||
31 | + set(SYSTEMD_LIBS systemd) | ||
32 | + endif(SYSTEMD_VERSION LESS 209) | ||
33 | +endif(WITH_SYSTEMD_JOURNAL) | ||
34 | + | ||
35 | set(DLT_LIBRARIES dlt ${GTEST_LIBS} ${LIBRARIES}) | ||
36 | -set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES}) | ||
37 | +set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES} ${SYSTEMD_LIBS}) | ||
38 | set(DLT_CONTROL_LIBRARIES dlt dlt_control_common_lib ${GTEST_LIBS}) | ||
39 | |||
40 | #Receiver used for QTs. add_test() is not required | ||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch deleted file mode 100644 index 3290d1108..000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Bug: https://bugs.debian.org/1041124 | ||
2 | From 3f8bc3343983697531d52918fb6cdba19593f3a8 Mon Sep 17 00:00:00 2001 | ||
3 | From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> | ||
4 | Date: Sat, 15 Jul 2023 11:31:55 +0200 | ||
5 | Subject: [PATCH] Update CMakeLists.txt: set required std version to gnu++14 | ||
6 | |||
7 | New googletest 1.13.0 defaults to gnu++14, so makes this package FTBFS when building testsuite with this error: | ||
8 | |||
9 | In file included from /usr/include/gtest/gtest-message.h:57, | ||
10 | from /usr/include/gtest/gtest-assertion-result.h:46, | ||
11 | from /usr/include/gtest/gtest.h:64, | ||
12 | from /build/1st/dlt-daemon-2.18.9/tests/gtest_dlt_user.cpp:27: | ||
13 | /usr/include/gtest/internal/gtest-port.h:270:2: error: #error C++ versions less than C++14 are not supported. | ||
14 | 270 | #error C++ versions less than C++14 are not supported. | ||
15 | | ^~~~~ | ||
16 | |||
17 | Thanks Adrian Bunk <bunk@debian.org> for the report and the fix! | ||
18 | --- | ||
19 | CMakeLists.txt | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
23 | index 014fc3bb..b2e056db 100644 | ||
24 | --- a/CMakeLists.txt | ||
25 | +++ b/CMakeLists.txt | ||
26 | @@ -213,7 +213,7 @@ endif() | ||
27 | |||
28 | add_compile_options( | ||
29 | $<$<COMPILE_LANGUAGE:C>:-std=gnu99> | ||
30 | - $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11> | ||
31 | + $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14> | ||
32 | -Wall | ||
33 | -Wextra | ||
34 | # -pedantic | ||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb index 2d6d1879a..33fae0619 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb | |||
@@ -17,11 +17,8 @@ DEPENDS = "zlib gzip-native json-c" | |||
17 | SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ | 17 | SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ |
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://481.patch \ | ||
21 | file://482.patch \ | ||
22 | file://504.patch \ | ||
23 | " | 20 | " |
24 | SRCREV = "9a2312d3512a27620d41b9a325338b6e7b3d42de" | 21 | SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f" |
25 | 22 | ||
26 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
27 | 24 | ||
@@ -49,7 +46,7 @@ PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt- | |||
49 | 46 | ||
50 | inherit autotools gettext cmake pkgconfig systemd | 47 | inherit autotools gettext cmake pkgconfig systemd |
51 | 48 | ||
52 | EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" | 49 | EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" |
53 | 50 | ||
54 | PACKAGES += "${PN}-systemd" | 51 | PACKAGES += "${PN}-systemd" |
55 | SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" | 52 | SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" |