Initial commit
This commit is contained in:
Your Name
+94
@@ -0,0 +1,94 @@
|
||||
From bcca4c99394ba422d03a5e76f2a0023ef248824a Mon Sep 17 00:00:00 2001
|
||||
From: Andrei Gherzan <andrei.gherzan@windriver.com>
|
||||
Date: Tue, 18 Nov 2014 15:47:22 +0100
|
||||
Subject: [PATCH 2/4] Don't execute processes as a specific user.
|
||||
|
||||
Upstream-Status: Inappropriate [Configuration Specific]
|
||||
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
|
||||
---
|
||||
systemd/dlt-adaptor-udp.service.cmake | 1 -
|
||||
systemd/dlt-dbus.service.cmake | 1 -
|
||||
systemd/dlt-example-user.service.cmake | 1 -
|
||||
systemd/dlt-receive.service.cmake | 1 -
|
||||
systemd/dlt-system.service.cmake | 1 -
|
||||
systemd/dlt.service.cmake | 1 -
|
||||
6 files changed, 6 deletions(-)
|
||||
|
||||
diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake
|
||||
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
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
-User=@DLT_USER@
|
||||
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@
|
||||
LimitCORE=infinity
|
||||
|
||||
[Install]
|
||||
-WantedBy=multi-user.target
|
||||
\ No newline at end of file
|
||||
+WantedBy=multi-user.target
|
||||
diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake
|
||||
index 9baf3e9..74a7eac 100644
|
||||
--- a/systemd/dlt-dbus.service.cmake
|
||||
+++ b/systemd/dlt-dbus.service.cmake
|
||||
@@ -20,7 +20,6 @@ Wants=dlt.service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
-User=@DLT_USER@
|
||||
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus
|
||||
WatchdogSec=@DLT_WatchdogSec@
|
||||
NotifyAccess=main
|
||||
diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake
|
||||
index b665742..35009b0 100644
|
||||
--- a/systemd/dlt-example-user.service.cmake
|
||||
+++ b/systemd/dlt-example-user.service.cmake
|
||||
@@ -21,6 +21,5 @@ Wants=dlt.service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
-User=@DLT_USER@
|
||||
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application"
|
||||
-LimitCORE=infinity
|
||||
\ No newline at end of file
|
||||
+LimitCORE=infinity
|
||||
diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake
|
||||
index c07d447..8f88f00 100644
|
||||
--- a/systemd/dlt-receive.service.cmake
|
||||
+++ b/systemd/dlt-receive.service.cmake
|
||||
@@ -22,6 +22,5 @@ Wants=dlt.service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
-User=@DLT_USER@
|
||||
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost
|
||||
-LimitCORE=infinity
|
||||
\ No newline at end of file
|
||||
+LimitCORE=infinity
|
||||
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
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
-User=@DLT_USER@
|
||||
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system
|
||||
WatchdogSec=@DLT_WatchdogSec@
|
||||
NotifyAccess=main
|
||||
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)
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
-User=@DLT_USER@
|
||||
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon
|
||||
WatchdogSec=@DLT_WatchdogSec@
|
||||
NotifyAccess=main
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
From 9a5e655cf57301008cd61d53c8a410a7f397e650 Mon Sep 17 00:00:00 2001
|
||||
From: Andrei Gherzan <andrei.gherzan@windriver.com>
|
||||
Date: Tue, 18 Nov 2014 15:51:30 +0100
|
||||
Subject: [PATCH 4/4] Modify systemd config directory
|
||||
|
||||
Upstream-Status: Inappropriate [Configuration Specific]
|
||||
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
|
||||
---
|
||||
systemd/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e6b44a2..0e885bf 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -201,7 +201,7 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL)
|
||||
|
||||
set(systemd_SRCS ${PROJECT_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c)
|
||||
|
||||
- set(SYSTEMD_UNITDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" CACHE PATH
|
||||
+ set(SYSTEMD_UNITDIR "/lib/systemd/system" CACHE PATH
|
||||
"Set directory to install systemd unit files")
|
||||
|
||||
add_subdirectory(systemd)
|
||||
@@ -0,0 +1,49 @@
|
||||
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);
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
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
|
||||
@@ -0,0 +1,70 @@
|
||||
SUMMARY = "Diagnostic Log and Trace"
|
||||
DESCRIPTION = "This component provides a standardised log and trace interface, \
|
||||
based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \
|
||||
This component can be used by COVESA components and other applications as \
|
||||
logging facility providing: \
|
||||
- the DLT shared library \
|
||||
- the DLT daemon, including startup scripts \
|
||||
- the DLT daemon adaptors- the DLT client console utilities \
|
||||
- the DLT test applications"
|
||||
HOMEPAGE = "https://www.covesa.global/"
|
||||
SECTION = "console/utils"
|
||||
LICENSE = "MPL-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea"
|
||||
|
||||
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 \
|
||||
"
|
||||
SRCREV = "9a2312d3512a27620d41b9a325338b6e7b3d42de"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console ', '', d)} \
|
||||
udp-connection dlt-system dlt-filetransfer "
|
||||
# dlt-dbus
|
||||
|
||||
# General options
|
||||
PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd"
|
||||
|
||||
# Linux options
|
||||
PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF -DWITH_DLT_SYSTEM=OFF,systemd"
|
||||
PACKAGECONFIG[systemd-watchdog] = "-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd"
|
||||
PACKAGECONFIG[systemd-journal] = "-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd"
|
||||
PACKAGECONFIG[dlt-dbus] = "-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib"
|
||||
PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION=OFF"
|
||||
|
||||
# Command line options
|
||||
PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF"
|
||||
PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd"
|
||||
PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=OFF,,dlt-daemon-systemd"
|
||||
PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF,,dlt-daemon-systemd"
|
||||
PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF"
|
||||
PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd"
|
||||
|
||||
inherit autotools gettext cmake pkgconfig systemd
|
||||
|
||||
EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
|
||||
|
||||
PACKAGES += "${PN}-systemd"
|
||||
SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
|
||||
SYSTEMD_SERVICE:${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}"
|
||||
SYSTEMD_AUTO_ENABLE:${PN} = "enable"
|
||||
SYSTEMD_SERVICE:${PN}-systemd = " \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor-udp', 'dlt-adaptor-udp.service', '', d)} \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \
|
||||
"
|
||||
SYSTEMD_AUTO_ENABLE:${PN}-systemd = "disable"
|
||||
|
||||
FILES:${PN}-doc += "${datadir}/dlt-filetransfer"
|
||||
|
||||
do_install:append() {
|
||||
rm -f ${D}${bindir}/dlt-test-*
|
||||
}
|
||||
Reference in New Issue
Block a user