diff options
| author | Changqing Li <changqing.li@windriver.com> | 2026-04-10 17:26:32 +0800 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-10 17:25:49 -0700 |
| commit | 563b91e5cab19152333b9269b2c0f696d7c6bfe3 (patch) | |
| tree | a30190fd9f7f99aabb82204532f5e2198e91bc06 | |
| parent | 389cf85390f50cbfde89bf64dfe978fd3a35771c (diff) | |
| download | meta-openembedded-563b91e5cab19152333b9269b2c0f696d7c6bfe3.tar.gz | |
dlt-daemon: fix wrong CONFIGURATION_FILES_DIR
The not aligned value of CONFIGURATION_FILES_DIR makes the configuration
file install path is different with the default configuration file path
from where the application to read, then make the service dlt/dlt-system
not works well.
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
| -rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch | 42 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch new file mode 100644 index 0000000000..2d51253e69 --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | From bad5d689a69dca3d1dc3e7653946f1205661afbf Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Fri, 10 Apr 2026 13:25:39 +0800 | ||
| 4 | Subject: [PATCH 1/2] CMakeLists.txt: make CONFIGURATION_FILES_DIR aligned | ||
| 5 | |||
| 6 | Commit [723e90e dlt: Adaptation for QNX build system with SDP 7.x | ||
| 7 | (#609)], refer [1], make CONFIGURATION_FILES_DIR not aligned. the CMake | ||
| 8 | variable CONFIGURATION_FILES_DIR set to CMAKE_INSTALL_SYSCONFDIR, but | ||
| 9 | the tell the compiler to define macro CONFIGURATION_FILES_DIR as | ||
| 10 | ${CMAKE_INSTALL_PREFIX}/${CONFIGURATION_FILES_DIR}. | ||
| 11 | |||
| 12 | At least for linux, this will cause failure of the systemd service. Eg: | ||
| 13 | if CMAKE_INSTALL_PREFIX is /usr, then the configuration file is | ||
| 14 | installed under ${CONFIGURATION_FILES_DIR}, usually is /etc. But the | ||
| 15 | application like dlt-daemon/dlt-system will find the default | ||
| 16 | configuration file under /usr/etc. This makes service start failed. | ||
| 17 | |||
| 18 | [1] https://github.com/COVESA/dlt-daemon/commit/723e90e77db91130375238a592b9a292302a32bb | ||
| 19 | |||
| 20 | Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/issues/848] | ||
| 21 | |||
| 22 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 23 | --- | ||
| 24 | CMakeLists.txt | 2 +- | ||
| 25 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 26 | |||
| 27 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 28 | index bb9250f..821730a 100644 | ||
| 29 | --- a/CMakeLists.txt | ||
| 30 | +++ b/CMakeLists.txt | ||
| 31 | @@ -289,7 +289,7 @@ endif() | ||
| 32 | |||
| 33 | set(CONFIGURATION_FILES_DIR ${CMAKE_INSTALL_SYSCONFDIR}) | ||
| 34 | |||
| 35 | -add_definitions(-DCONFIGURATION_FILES_DIR="${CMAKE_INSTALL_PREFIX}/${CONFIGURATION_FILES_DIR}") | ||
| 36 | +add_definitions(-DCONFIGURATION_FILES_DIR="${CONFIGURATION_FILES_DIR}") | ||
| 37 | |||
| 38 | add_subdirectory(cmake) | ||
| 39 | |||
| 40 | -- | ||
| 41 | 2.34.1 | ||
| 42 | |||
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb index 431e9f3067..609566a1b3 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb | |||
| @@ -22,6 +22,7 @@ SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ | |||
| 22 | file://0001-Fix-build-failures.patch \ | 22 | file://0001-Fix-build-failures.patch \ |
| 23 | file://0001-fix-build-failure-when-systemd-is-enabled.patch \ | 23 | file://0001-fix-build-failure-when-systemd-is-enabled.patch \ |
| 24 | file://0001-Fix-build-failure-with-glibc-2.43.patch \ | 24 | file://0001-Fix-build-failure-with-glibc-2.43.patch \ |
| 25 | file://0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch \ | ||
| 25 | " | 26 | " |
| 26 | SRCREV = "f595ea29d1007ca1c3b2d1fd3a88adf7d3db6320" | 27 | SRCREV = "f595ea29d1007ca1c3b2d1fd3a88adf7d3db6320" |
| 27 | 28 | ||
