@@ -18,7 +18,7 @@ diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.ser
index 8dac1f2..ecf9f9e 100644
--- a/systemd/dlt-adaptor-udp.service.cmake
+++ b/systemd/dlt-adaptor-udp.service.cmake
-@@ -21,9 +21,8 @@ Wants=dlt.service
+@@ -19,9 +19,8 @@ Wants=dlt.service
[Service]
Type=simple
@@ -51,7 +51,7 @@ index b665742..35009b0 100644
[Service]
Type=simple
-User=@DLT_USER@
- ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application"
+ ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from COVESA DLT example user application"
-LimitCORE=infinity
\ No newline at end of file
+LimitCORE=infinity
@@ -59,7 +59,7 @@ diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cma
index c07d447..8f88f00 100644
--- a/systemd/dlt-receive.service.cmake
+++ b/systemd/dlt-receive.service.cmake
-@@ -22,6 +22,5 @@ Wants=dlt.service
+@@ -20,6 +20,5 @@ Wants=dlt.service
[Service]
Type=simple
@@ -72,7 +72,7 @@ diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake
index 0e91f42..1a5b913 100755
--- a/systemd/dlt-system.service.cmake
+++ b/systemd/dlt-system.service.cmake
-@@ -22,7 +22,6 @@ Wants=dlt.service
+@@ -20,7 +20,6 @@ Wants=dlt.service
[Service]
Type=simple
@@ -84,7 +84,7 @@ diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake
index 0b3ee2c..e4753a2 100755
--- a/systemd/dlt.service.cmake
+++ b/systemd/dlt.service.cmake
-@@ -21,7 +21,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5)
+@@ -19,7 +19,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5)
[Service]
Type=simple
deleted file mode 100644
@@ -1,49 +0,0 @@
-From 95476de802585629c6d89707a9247bbb0c70f6c9 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Fri, 28 Apr 2023 22:39:57 +0200
-Subject: [PATCH] Update gtest_dlt_daemon_multiple_files_logging.cpp
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build error due to dlt_vlog not having the correct format string with security build flags enabled
-
-[ 88%] Building CXX object tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o
-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
-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()’:
-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]
- 106 | dlt_vlog(LOG_INFO, log1);
- | ~~~~~~~~^~~~~~~~~~~~~~~~
-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]
- 110 | dlt_vlog(LOG_INFO, log2);
- | ~~~~~~~~^~~~~~~~~~~~~~~~
-In file included from /usr/include/string.h:535,
- from /usr/include/gtest/internal/gtest-port.h:264,
- from /usr/include/gtest/internal/gtest-internal.h:40,
- from /usr/include/gtest/gtest.h:62,
- from dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:27:
-In function ‘strncpy’,
----
-Upstream-Status: Pending
-
- tests/gtest_dlt_daemon_multiple_files_logging.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/gtest_dlt_daemon_multiple_files_logging.cpp b/tests/gtest_dlt_daemon_multiple_files_logging.cpp
-index 2da512e1..05b58f2c 100644
---- a/tests/gtest_dlt_daemon_multiple_files_logging.cpp
-+++ b/tests/gtest_dlt_daemon_multiple_files_logging.cpp
-@@ -103,11 +103,11 @@ TEST(t_dlt_logging_multiple_files_append_reinit, normal)
- const char* log2 = "TWO\n";
-
- configure(path, file_name, true, file_size, max_file_size);
-- dlt_vlog(LOG_INFO, log1);
-+ dlt_vlog(LOG_INFO, "%s", log1);
- EXPECT_NO_THROW(dlt_log_free());
-
- configure(path, file_name, true, file_size, max_file_size);
-- dlt_vlog(LOG_INFO, log2);
-+ dlt_vlog(LOG_INFO, "%s", log2);
- EXPECT_NO_THROW(dlt_log_free());
- verify_in_one_file(path, file_name, log1, log2);
- }
deleted file mode 100644
@@ -1,40 +0,0 @@
-From b38761831670e980a58acb33d611f65255d678ac Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Fri, 28 Apr 2023 22:46:36 +0200
-Subject: [PATCH] Update CMakeLists.txt
-
-Link systemd libraries, to avoid underlinking of tests with
--DWITH_SYSTEMD_SOCKET_ACTIVATION=ON
-
-[ 82%] Linking CXX executable gtest_dlt_daemon_gateway
-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
-/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
-/usr/bin/ld: ../src/daemon/libdlt_daemon.so: undefined reference to `sd_listen_fds_with_names'
----
-Upstream-Status: Pending
-
- tests/CMakeLists.txt | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 579d7308..3155ca9a 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -21,8 +21,16 @@ else()
- set(LIBRARIES socket)
- endif()
-
-+if(WITH_SYSTEMD_JOURNAL)
-+ if(SYSTEMD_VERSION LESS 209)
-+ set(SYSTEMD_LIBS systemd-journal systemd-id128)
-+ else(SYSTEMD_VERSION LESS 209)
-+ set(SYSTEMD_LIBS systemd)
-+ endif(SYSTEMD_VERSION LESS 209)
-+endif(WITH_SYSTEMD_JOURNAL)
-+
- set(DLT_LIBRARIES dlt ${GTEST_LIBS} ${LIBRARIES})
--set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES})
-+set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES} ${SYSTEMD_LIBS})
- set(DLT_CONTROL_LIBRARIES dlt dlt_control_common_lib ${GTEST_LIBS})
-
- #Receiver used for QTs. add_test() is not required
deleted file mode 100644
@@ -1,34 +0,0 @@
-Bug: https://bugs.debian.org/1041124
-From 3f8bc3343983697531d52918fb6cdba19593f3a8 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Sat, 15 Jul 2023 11:31:55 +0200
-Subject: [PATCH] Update CMakeLists.txt: set required std version to gnu++14
-
-New googletest 1.13.0 defaults to gnu++14, so makes this package FTBFS when building testsuite with this error:
-
-In file included from /usr/include/gtest/gtest-message.h:57,
- from /usr/include/gtest/gtest-assertion-result.h:46,
- from /usr/include/gtest/gtest.h:64,
- from /build/1st/dlt-daemon-2.18.9/tests/gtest_dlt_user.cpp:27:
-/usr/include/gtest/internal/gtest-port.h:270:2: error: #error C++ versions less than C++14 are not supported.
- 270 | #error C++ versions less than C++14 are not supported.
- | ^~~~~
-
-Thanks Adrian Bunk <bunk@debian.org> for the report and the fix!
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 014fc3bb..b2e056db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,7 +213,7 @@ endif()
-
- add_compile_options(
- $<$<COMPILE_LANGUAGE:C>:-std=gnu99>
-- $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>
-+ $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14>
- -Wall
- -Wextra
- # -pedantic
similarity index 93%
rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb
rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
@@ -17,11 +17,8 @@ DEPENDS = "zlib gzip-native json-c"
SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
file://0004-Modify-systemd-config-directory.patch \
- file://481.patch \
- file://482.patch \
- file://504.patch \
"
-SRCREV = "9a2312d3512a27620d41b9a325338b6e7b3d42de"
+SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"
S = "${WORKDIR}/git"
@@ -49,7 +46,7 @@ PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-
inherit autotools gettext cmake pkgconfig systemd
-EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
+EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
PACKAGES += "${PN}-systemd"
SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
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> --- ...execute-processes-as-a-specific-user.patch | 10 ++-- .../dlt-daemon/dlt-daemon/481.patch | 49 ------------------- .../dlt-daemon/dlt-daemon/482.patch | 40 --------------- .../dlt-daemon/dlt-daemon/504.patch | 34 ------------- ...daemon_2.18.9.bb => dlt-daemon_2.18.10.bb} | 7 +-- 5 files changed, 7 insertions(+), 133 deletions(-) delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.9.bb => dlt-daemon_2.18.10.bb} (93%)