Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Release/
Debug/
build/
Release
Debug
build
automotive-dlt.spec
automotive-dlt.pc
config.h
Expand All @@ -9,15 +9,27 @@ include/dlt/dlt_user.h
.project
.cproject
.settings
.idea/
.idea
*~
*.o
*.out
*.swp
cmake-build-debug/
.vscode/
googletest/
cmake-build-debug
.vscode

# exclude temporary files
cscope.out
*.swp

# Temp debian build files
*.debhelper.log
.debhelper
*.substvars
debian/debhelper-build-stamp
debian/dlt-daemon
debian/dlt-examples
debian/dlt-tools
debian/files
debian/libdlt-dev
debian/libdlt2
debian/tmp
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,11 @@ if(WITH_SYSTEMD

find_package(PkgConfig REQUIRED)
execute_process(COMMAND pkg-config --modversion systemd OUTPUT_VARIABLE SYSTEMD_VERSION)
string(REPLACE "\n" "" SYSTEMD_VERSION ${SYSTEMD_VERSION})
if(SYSTEMD_VERSION)
string(REPLACE "\n" "" SYSTEMD_VERSION ${SYSTEMD_VERSION})
else()
set(SYSTEMD_VERSION "")
endif()

if(WITH_SYSTEMD)
add_definitions(-DDLT_SYSTEMD_ENABLE)
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dlt-daemon (2.18.10) UNRELEASED; urgency=medium

* Update Debian package build to v2.18.10

-- Luu Quang Minh <minh.luuquang@vn.bosch.com> Sun, 03 Aug 2025 12:51:56 +0700

dlt-daemon (2.18.7) unstable; urgency=low

* Initial release
Expand Down
1 change: 0 additions & 1 deletion debian/compat

This file was deleted.

2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: dlt-daemon
Section: utils
Priority: extra
Maintainer: Advanced Driver Information Technology
Build-Depends: debhelper (>= 9), cmake, pandoc,
Build-Depends: debhelper-compat (= 12), cmake, pandoc,
libdbus-1-dev, pkg-config, zlib1g-dev, libsystemd-dev


Expand Down
2 changes: 1 addition & 1 deletion debian/dlt-daemon.install
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ INSTALL_PREFIX_PATH/etc/dlt.conf
INSTALL_PREFIX_PATH/share/man/man1/dlt-daemon.1.gz
INSTALL_PREFIX_PATH/share/man/man5/dlt.conf.5.gz
INSTALL_PREFIX_PATH/share/man/man5/dlt_gateway.conf.5.gz
lib/systemd/system/dlt.service
INSTALL_PREFIX_PATH/lib/systemd/system/dlt.service
2 changes: 1 addition & 1 deletion debian/dlt-examples.install
Original file line number Diff line number Diff line change
@@ -1 +1 @@
INSTALL_PREFIX_PATH/bin/dlt-example-*
INSTALL_PREFIX_PATH/bin/dlt-example-*
4 changes: 2 additions & 2 deletions debian/dlt-tools.install
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ INSTALL_PREFIX_PATH/share/man/man1/dlt-passive-node-ctrl.1.gz
INSTALL_PREFIX_PATH/share/man/man1/dlt-receive.1.gz
INSTALL_PREFIX_PATH/share/man/man1/dlt-system.1.gz
INSTALL_PREFIX_PATH/share/man/man5/dlt-system.conf.5.gz
lib/systemd/system/dlt-adaptor-udp.service
lib/systemd/system/dlt-receive.service
INSTALL_PREFIX_PATH/lib/systemd/system/dlt-adaptor-udp.service
INSTALL_PREFIX_PATH/lib/systemd/system/dlt-receive.service
2 changes: 1 addition & 1 deletion debian/libdlt-dev.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
INSTALL_PREFIX_PATH/include/dlt/*
INSTALL_PREFIX_PATH/lib/*/libdlt.so
INSTALL_PREFIX_PATH/lib/*/pkgconfig/automotive-dlt.pc
INSTALL_PREFIX_PATH/lib/*/pkgconfig/automotive-dlt.pc
2 changes: 1 addition & 1 deletion debian/libdlt2.install
Original file line number Diff line number Diff line change
@@ -1 +1 @@
INSTALL_PREFIX_PATH/lib/*/libdlt.so.*
INSTALL_PREFIX_PATH/lib/*/libdlt.so.*
11 changes: 11 additions & 0 deletions debian/not-installed
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
opt/tooling/dlt/lib/$(DEB_HOST_MULTIARCH)/cmake/automotive-dlt/*
opt/tooling/dlt/share/dlt-filetransfer/dlt-test-filetransfer-file
opt/tooling/dlt/share/dlt-filetransfer/dlt-test-filetransfer-image.png
opt/tooling/dlt/share/man/man1/dlt-adaptor-stdin.1.gz
opt/tooling/dlt/share/man/man1/dlt-adaptor-udp.1.gz
opt/tooling/dlt/share/man/man1/dlt-control.1.gz
opt/tooling/dlt/share/man/man1/dlt-sortbytimestamp.1.gz
opt/tooling/dlt/bin/dlt-kpi
opt/tooling/dlt/bin/dlt-sortbytimestamp
opt/tooling/dlt/bin/dlt-test-*
opt/tooling/dlt/lib/systemd/system/dlt*
5 changes: 3 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ override_dh_auto_configure:
-DWITH_SYSTEMD=ON -DWITH_SYSTEMD_JOURNAL=ON \
-DWITH_MAN=ON -DWITH_DLT_DBUS=ON \
-DWITH_DLT_KPI=ON -DWITH_DLT_ADAPTOR=ON \
-DWITH_DLT_SYSTEM=ON -DCMAKE_INSTALL_PREFIX=/opt/tooling/dlt \
-DWITH_DLT_SYSTEM=ON \
-DCMAKE_INSTALL_PREFIX=/opt/tooling/dlt \
-DCMAKE_INSTALL_SYSCONFDIR=/opt/tooling/dlt/etc \
-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)

Expand All @@ -23,4 +24,4 @@ override_dh_shlibdeps:

override_dh_install:
sed -i 's/INSTALL_PREFIX_PATH/opt\/tooling\/dlt/g' debian/*.install; \
dh_install
dh_install
1 change: 1 addition & 0 deletions debian/source/format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0 (native)
1 change: 1 addition & 0 deletions debian/source/option
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extend-diff-ignore = .*
Loading