summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Muck <christian.muck@bmw.de>2011-09-05 16:20:16 +0200
committerChristian Muck <christian.muck@bmw.de>2011-09-05 16:20:16 +0200
commit0e31784368654143b61ce469fa1b5235abfdfc2c (patch)
tree371d727017b4259c2f7ba5969b689640e88ba90c
parent6bbb4fc3ea0d1414659822200ad44686d5ec4e24 (diff)
parentca77a002e8012b82068f959c95fb1a57f7d41d6b (diff)
downloadDLT-daemon-0e31784368654143b61ce469fa1b5235abfdfc2c.tar.gz
Merge branch 'develop2'
-rwxr-xr-xCMakeLists.txt17
-rwxr-xr-xReleaseNotes.txt2
-rwxr-xr-xinclude/dlt/dlt_version.h2
-rwxr-xr-xsystemd/dlt-syslog.service.cmake18
-rwxr-xr-xsystemd/dlt.service.cmake (renamed from systemd/dlt.service)3
5 files changed, 32 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44e7447..1b3f7f7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,6 +85,11 @@ SET( GPROF_DLT_TESTS OFF)
SET( GPROF_DLT_CONSOLE OFF)
SET( GPROF_DLT_ADAPTOR OFF)
+###################### systemd Settings #################
+SET( DLT_SYSLOG_APPID "SYS" )
+SET( DLT_SYSLOG_CTID "LOG" )
+SET( DLT_SYSLOG_PORT 4712 )
+
SET( prefix ${CMAKE_INSTALL_PREFIX})
SET( libdir "\${exec_prefix}/lib" )
SET( includedir "\${exec_prefix}/include" )
@@ -173,6 +178,8 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/config.h @
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h.cmake ${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h @ONLY)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doxygen.cfg.cmake ${CMAKE_SOURCE_DIR}/doxygen.cfg @ONLY)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/automotive-dlt.pc.cmake ${CMAKE_SOURCE_DIR}/automotive-dlt.pc @ONLY)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt.service.cmake ${CMAKE_SOURCE_DIR}/systemd/dlt.service @ONLY)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service.cmake ${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service @ONLY)
#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/automotive-dlt.spec.cmake ${CMAKE_SOURCE_DIR}/package/automotive-dlt.spec ESCAPE_QUOTES)
OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )
@@ -243,13 +250,9 @@ CONFIGURE_FILE(
EXPORT_LIBRARY_DEPENDENCIES( "${PROJECT_NAME}LibDeps.cmake" )
-#######################
-# CPack configuration #
-#######################
-
+################ CPack configuration #################
SET(CPACK_GENERATOR "DEB;RPM;TGZ")
-
-SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Alexander Wenzel") #required
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Alexander Wenzel")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "automotive-dlt")
SET(CPACK_PACKAGE_DESCRIPTION "This component provides a standardised log and trace interface, based on the
standardised protocol specified in the AUTOSAR standard 4.0 DLT.
@@ -261,7 +264,7 @@ logging facility providing
- the DLT client console utilities
- the DLT test applications ")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
-SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_PACKAGE_VERSION_MAJOR ${PRINT_MAJOR_VERSION})
SET(CPACK_PACKAGE_VERSION_MINOR ${PRINT_MINOR_VERSION})
SET(CPACK_PACKAGE_VERSION_PATCH ${PRINT_PATCH_LEVEL})
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index beece75..f573f4e 100755
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -26,7 +26,7 @@ Changes in this release
2.3.0
Improvements
-
+ * [GSW-16] Systemd configuration for syslog to DLT dapater
* [GSW-62] DLT Library version check
* [GSW-28] Directory where persistent data is stored is not configurable
* [GSW-46] DLT client library sets a huge stack size for internal thread
diff --git a/include/dlt/dlt_version.h b/include/dlt/dlt_version.h
index 48d37a2..6e4cde7 100755
--- a/include/dlt/dlt_version.h
+++ b/include/dlt/dlt_version.h
@@ -7,6 +7,6 @@
#define PACKAGE_MAJOR_VERSION "2"
#define PACKAGE_MINOR_VERSION "2"
#define PACKAGE_PATCH_LEVEL "0"
-#define PACKAGE_REVISION "v2.2.0-9-g48928c6"
+#define PACKAGE_REVISION "v2.2.0-10-gd818704"
#endif
diff --git a/systemd/dlt-syslog.service.cmake b/systemd/dlt-syslog.service.cmake
new file mode 100755
index 0000000..6f4db32
--- /dev/null
+++ b/systemd/dlt-syslog.service.cmake
@@ -0,0 +1,18 @@
+# This file is for starting dlt-adaptor-udp
+#
+# For more informations about starting options of dlt-daemon use the command "dlt-adaptor-udp -h".
+#
+# basic.target A special target unit covering early boot-up.
+# Usually this should pull-in all sockets, mount points, swap devices and
+# other basic initialization necessary for the general purpose daemons.
+# Most normal daemons should have dependencies of type After and Requires on this unit
+
+[Unit]
+Description=DLT Syslog Adapter
+
+[Service]
+ExecStart=/usr/local/bin/dlt-adaptor-udp -a @DLT_SYSLOG_APPID@ -c @DLT_SYSLOG_CTID@ -p @DLT_SYSLOG_PORT@
+# Restart=always
+
+[Install]
+WantedBy=basic.target
diff --git a/systemd/dlt.service b/systemd/dlt.service.cmake
index 5bee126..357366a 100755
--- a/systemd/dlt.service
+++ b/systemd/dlt.service.cmake
@@ -5,6 +5,7 @@
#
# Multi-user.target is a special target unit for setting up a multi-user system (non-graphical).
# For more details about the multi-user.target see systemd.special(7).
+
[Unit]
Description=DLT Daemon for logging and tracing
@@ -13,4 +14,4 @@ ExecStart=/usr/local/bin/dlt-daemon -r
#Restart=always
[Install]
-WantedBy=multi-user.target \ No newline at end of file
+WantedBy=multi-user.target