Skip to content

Commit e3e9edf

Browse files
minminlittleshrimpminminlittleshrimp
committed
debian: Update version and refactor deb-pkg build
Signed-off-by: lum3hc <Minh.LuuQuang@vn.bosch.com>
1 parent c5fc99c commit e3e9edf

File tree

14 files changed

+78
-43
lines changed

14 files changed

+78
-43
lines changed

‎.gitignore‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Release/
2-
Debug/
3-
build/
1+
Release
2+
Debug
3+
build
44
automotive-dlt.spec
55
automotive-dlt.pc
66
config.h
@@ -9,15 +9,27 @@ include/dlt/dlt_user.h
99
.project
1010
.cproject
1111
.settings
12-
.idea/
12+
.idea
1313
*~
1414
*.o
1515
*.out
1616
*.swp
17-
cmake-build-debug/
18-
.vscode/
19-
googletest/
17+
cmake-build-debug
18+
.vscode
2019

2120
# exclude temporary files
2221
cscope.out
2322
*.swp
23+
24+
# Temp debian build files
25+
*.debhelper.log
26+
.debhelper
27+
*.substvars
28+
debian/debhelper-build-stamp
29+
debian/dlt-daemon
30+
debian/dlt-examples
31+
debian/dlt-tools
32+
debian/files
33+
debian/libdlt-dev
34+
debian/libdlt2
35+
debian/tmp

‎CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,11 @@ if(WITH_SYSTEMD
298298

299299
find_package(PkgConfig REQUIRED)
300300
execute_process(COMMAND pkg-config --modversion systemd OUTPUT_VARIABLE SYSTEMD_VERSION)
301-
string(REPLACE "\n" "" SYSTEMD_VERSION ${SYSTEMD_VERSION})
301+
if(SYSTEMD_VERSION)
302+
string(REPLACE "\n" "" SYSTEMD_VERSION ${SYSTEMD_VERSION})
303+
else()
304+
set(SYSTEMD_VERSION "")
305+
endif()
302306

303307
if(WITH_SYSTEMD)
304308
add_definitions(-DDLT_SYSTEMD_ENABLE)

‎debian/changelog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
dlt-daemon (2.18.10) UNRELEASED; urgency=medium
2+
3+
* Update Debian package build to v2.18.10
4+
5+
-- Luu Quang Minh <minh.luuquang@vn.bosch.com> Sun, 03 Aug 2025 12:51:56 +0700
6+
17
dlt-daemon (2.18.7) unstable; urgency=low
28

39
* Initial release

‎debian/compat‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: dlt-daemon
22
Section: utils
33
Priority: extra
44
Maintainer: Advanced Driver Information Technology
5-
Build-Depends: debhelper (>= 9), cmake, pandoc,
5+
Build-Depends: debhelper-compat (= 13), cmake, pandoc,
66
libdbus-1-dev, pkg-config, zlib1g-dev, libsystemd-dev
77

88

‎debian/dlt-daemon.install‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
INSTALL_PREFIX_PATH/bin/dlt-daemon
2-
INSTALL_PREFIX_PATH/etc/dlt_gateway.conf
3-
INSTALL_PREFIX_PATH/etc/dlt.conf
4-
INSTALL_PREFIX_PATH/share/man/man1/dlt-daemon.1.gz
5-
INSTALL_PREFIX_PATH/share/man/man5/dlt.conf.5.gz
6-
INSTALL_PREFIX_PATH/share/man/man5/dlt_gateway.conf.5.gz
7-
lib/systemd/system/dlt.service
1+
opt/tooling/dlt/bin/dlt-daemon
2+
opt/tooling/dlt/etc/dlt_gateway.conf
3+
opt/tooling/dlt/etc/dlt.conf
4+
opt/tooling/dlt/share/man/man1/dlt-daemon.1.gz
5+
opt/tooling/dlt/share/man/man5/dlt.conf.5.gz
6+
opt/tooling/dlt/share/man/man5/dlt_gateway.conf.5.gz
7+
opt/tooling/dlt/lib/systemd/system/dlt.service

‎debian/dlt-examples.install‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSTALL_PREFIX_PATH/bin/dlt-example-*
1+
opt/tooling/dlt/bin/dlt-example-*

‎debian/dlt-tools.install‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
INSTALL_PREFIX_PATH/etc/dlt-dbus.conf
2-
INSTALL_PREFIX_PATH/etc/dlt-kpi.conf
3-
INSTALL_PREFIX_PATH/etc/dlt-system.conf
4-
INSTALL_PREFIX_PATH/bin/dlt-adaptor-*
5-
INSTALL_PREFIX_PATH/bin/dlt-control
6-
INSTALL_PREFIX_PATH/bin/dlt-convert
7-
INSTALL_PREFIX_PATH/bin/dlt-dbus
8-
INSTALL_PREFIX_PATH/bin/dlt-logstorage-ctrl
9-
INSTALL_PREFIX_PATH/bin/dlt-passive-node-ctrl
10-
INSTALL_PREFIX_PATH/bin/dlt-receive
11-
INSTALL_PREFIX_PATH/bin/dlt-system
12-
INSTALL_PREFIX_PATH/share/man/man1/dlt-convert.1.gz
13-
INSTALL_PREFIX_PATH/share/man/man1/dlt-logstorage-ctrl.1.gz
14-
INSTALL_PREFIX_PATH/share/man/man1/dlt-passive-node-ctrl.1.gz
15-
INSTALL_PREFIX_PATH/share/man/man1/dlt-receive.1.gz
16-
INSTALL_PREFIX_PATH/share/man/man1/dlt-system.1.gz
17-
INSTALL_PREFIX_PATH/share/man/man5/dlt-system.conf.5.gz
18-
lib/systemd/system/dlt-adaptor-udp.service
19-
lib/systemd/system/dlt-receive.service
1+
opt/tooling/dlt/etc/dlt-dbus.conf
2+
opt/tooling/dlt/etc/dlt-kpi.conf
3+
opt/tooling/dlt/etc/dlt-system.conf
4+
opt/tooling/dlt/bin/dlt-adaptor-*
5+
opt/tooling/dlt/bin/dlt-control
6+
opt/tooling/dlt/bin/dlt-convert
7+
opt/tooling/dlt/bin/dlt-dbus
8+
opt/tooling/dlt/bin/dlt-logstorage-ctrl
9+
opt/tooling/dlt/bin/dlt-passive-node-ctrl
10+
opt/tooling/dlt/bin/dlt-receive
11+
opt/tooling/dlt/bin/dlt-system
12+
opt/tooling/dlt/share/man/man1/dlt-convert.1.gz
13+
opt/tooling/dlt/share/man/man1/dlt-logstorage-ctrl.1.gz
14+
opt/tooling/dlt/share/man/man1/dlt-passive-node-ctrl.1.gz
15+
opt/tooling/dlt/share/man/man1/dlt-receive.1.gz
16+
opt/tooling/dlt/share/man/man1/dlt-system.1.gz
17+
opt/tooling/dlt/share/man/man5/dlt-system.conf.5.gz
18+
opt/tooling/dlt/lib/systemd/system/dlt-adaptor-udp.service
19+
opt/tooling/dlt/lib/systemd/system/dlt-receive.service

‎debian/libdlt-dev.install‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
INSTALL_PREFIX_PATH/include/dlt/*
2-
INSTALL_PREFIX_PATH/lib/*/libdlt.so
3-
INSTALL_PREFIX_PATH/lib/*/pkgconfig/automotive-dlt.pc
1+
opt/tooling/dlt/include/dlt/*
2+
opt/tooling/dlt/lib/*/libdlt.so
3+
opt/tooling/dlt/lib/*/pkgconfig/automotive-dlt.pc

‎debian/libdlt2.install‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSTALL_PREFIX_PATH/lib/*/libdlt.so.*
1+
opt/tooling/dlt/lib/*/libdlt.so.*

0 commit comments

Comments
 (0)