| Message ID | 1642725323-23968-1-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe] dlt-daemon: upgrade 2.18.7 -> 2.18.8 | expand |
fails to build see https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1376 On Thu, Jan 20, 2022 at 4:36 PM wangmy <wangmy@fujitsu.com> wrote: > > Changelog: > ========= > lib: Fix wrong type alert from lgtm > gtest_dlt_daemon_gateway: fix gtest build failed > lib: generate dlt library internal log file > tests: add stdlib to dlt_cpp_extension > dlt_user: Make dlt_init thread safe > remove clang-tidy analyzer warnings: incompatible pointer type > debian: improve debian build package > dlt-control-common: shutdown and close socket > dlt_common: improve function description > gtest: Bring-in changes > gtest: Rework WORKING_DIRECTORY > gtest: Correct data amount in gtest_dlt_common > cmake: Set empty to systemd_SRCS > gtest: Refactor tests/CMakeLists.txt > lib: Add SOCK_CLOEXEC to socket > daemon: Create parent directory for unix socket > cmake: Correct added subdirectories > console: Add cmake options for control and timestamp > tests: Adapt to DLT_DISABLE_MACRO > header: Adapt to DLT_DISABLE_MACRO > include: Refactor CMakeLists.txt > gtest: Change script name to gtest_dlt_daemon_offline_log.sh > daemon: Enable to use FIFO on QNX > tests: Add new test case with given buffer > tests: Enable macro disabling > lib: Add new interfaces with given buffer > Implemention of tests for the dlt-qnx-system module > lib: Add MaxFileSize handling > client: pthread_join for deinit > doc: update initial log level document > dlt-system: Fix memory leak in dlt-system config > dlt_common: remove duplicate stdbool header > dlt-control: Add option to config port > system: use signalfd for dlt-system > console: provides args option to enable send/receive serial header > fix malformed printf format strings (#295) > cmake: Set WITH_LEGACY_INCLUDE_PATH to ON as default (#334) > Make the legacy include path a CMake option (#332) > daemon: Call dlt_daemon_configuration_load() properly (#330) > dlt_user: Use pthread_setname_np() if available (#326) > libdlt: Add legacy include path in exported CMake config file (#327) > lib: Set TYLE to 1 for BOOL type (#320) > file-transfer: Abort file transfer if get serial number failed > dlt_user.c: fixing casting wrong type > dlt-sortbytimestamp: Remove duplicated conditional statements code > dlt-convert: Remove duplicated conditional statements code > doc: Minor fix in dlt_for_developers.md (#321) > dlt-control-common.c: Fix build failure due to out-of-bound write -Werror=stringop-truncation > Extend include path in *.pc file (#319) > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > .../dlt-daemon/dlt-daemon/317.patch | 43 ------------------- > ...-daemon_2.18.7.bb => dlt-daemon_2.18.8.bb} | 9 ++-- > 2 files changed, 4 insertions(+), 48 deletions(-) > delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch > rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.7.bb => dlt-daemon_2.18.8.bb} (93%) > > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch > deleted file mode 100644 > index fe40334b6..000000000 > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -Origin: https://github.com/GENIVI/dlt-daemon/pull/317 > -From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 00:00:00 2001 > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> > -Date: Thu, 1 Jul 2021 12:58:20 +0200 > -Subject: [PATCH] dlt-control-common.c: Fix build failure due to out-of-bound > - write -Werror=stringop-truncation > - > -cd /build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/src/console/logstorage && /usr/bin/cc -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 -I/build/dlt-daemon-2.18.7 -I/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/include/dlt -I/build/dlt-daemon-2.18.7/include/dlt -I/build/dlt-daemon-2.18.7/src/shared -I/build/dlt-daemon-2.18.7/src/core_dump_handler -I/build/dlt-daemon-2.18.7/src/offlinelogstorage -I/build/dlt-daemon-2.18.7/src/lib -I/build/dlt-daemon-2.18.7/src/daemon -I/build/dlt-daemon-2.18.7/src/console -I/build/dlt-daemon-2.18.7/src/gateway -I/build/dlt-daemon-2.18.7/systemd/3rdparty -g -O2 -ffile-prefix-map=/build/dlt-daemon-2.18.7=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Werror -std=gnu99 -Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -o CMakeFiles/dlt-logstorage-ctrl.dir/__/dlt-control-common.c.o -c /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c > -make[3]: Leaving directory '/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu' > -In file included from /usr/include/string.h:495, > - from /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:56: > -In function 'strncpy', > - inlined from 'dlt_json_filter_load' at /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:716:13: > -/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] > - 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); > - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -In function 'strncpy', > - inlined from 'dlt_json_filter_load' at /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:721:13: > -/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] > - 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); > - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > - > -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> > ---- > - src/console/dlt-control-common.c | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c > -index 8a9d29f0..f58d8268 100644 > ---- a/src/console/dlt-control-common.c > -+++ b/src/console/dlt-control-common.c > -@@ -671,8 +671,8 @@ DltReturnValue dlt_json_filter_load(DltFilter *filter, const char *filename, int > - struct json_object *j_payload_max; > - enum json_tokener_error jerr; > - > -- char app_id[DLT_ID_SIZE] = ""; > -- char context_id[DLT_ID_SIZE] = ""; > -+ char app_id[DLT_ID_SIZE + 1] = ""; > -+ char context_id[DLT_ID_SIZE + 1] = ""; > - int32_t log_level = 0; > - int32_t payload_max = INT32_MAX; > - int32_t payload_min = 0; > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb > similarity index 93% > rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb > rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb > index e5a3c7c29..fc90d30b8 100644 > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb > @@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" > DEPENDS = "zlib gzip-native json-c" > > SRC_URI = "git://github.com/GENIVI/${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://317.patch \ > -" > -SRCREV = "24d197214bfdcec7430d31b42e5c87df27287aaf" > + file://0002-Don-t-execute-processes-as-a-specific-user.patch \ > + file://0004-Modify-systemd-config-directory.patch \ > + " > +SRCREV = "1438fcf8c88cd47b20b2984180a8457c3eb9193d" > > S = "${WORKDIR}/git" > > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#94960): https://lists.openembedded.org/g/openembedded-devel/message/94960 > Mute This Topic: https://lists.openembedded.org/mt/88573650/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
At systemd to DISTRO_FEATURES to compile systemd can solve this problem. I added systemd to DEPENDS in bb file. So when compiling, it will prompt that systemd needs to be added in DISTRO_FEATURES. Is this solution Ok? -- Best Regards --------------------------------------------------- Wang Mingyu Development Dept.I Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China TEL: +86+25-86630566-8568 COINS: 79988548 FAX: +86+25-83317685 MAIL: wangmy@fujitsu.com http://www.fujitsu.com/cn/fnst/ > -----Original Message----- > From: Khem Raj <raj.khem@gmail.com> > Sent: Saturday, January 22, 2022 2:05 AM > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com> > Cc: openembeded-devel <openembedded-devel@lists.openembedded.org> > Subject: Re: [oe] [meta-oe] [PATCH] dlt-daemon: upgrade 2.18.7 -> 2.18.8 > > fails to build see > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1376 > > On Thu, Jan 20, 2022 at 4:36 PM wangmy <wangmy@fujitsu.com> wrote: > > > > Changelog: > > ========= > > lib: Fix wrong type alert from lgtm > > gtest_dlt_daemon_gateway: fix gtest build failed > > lib: generate dlt library internal log file > > tests: add stdlib to dlt_cpp_extension > > dlt_user: Make dlt_init thread safe > > remove clang-tidy analyzer warnings: incompatible pointer type > > debian: improve debian build package > > dlt-control-common: shutdown and close socket > > dlt_common: improve function description > > gtest: Bring-in changes > > gtest: Rework WORKING_DIRECTORY > > gtest: Correct data amount in gtest_dlt_common > > cmake: Set empty to systemd_SRCS > > gtest: Refactor tests/CMakeLists.txt > > lib: Add SOCK_CLOEXEC to socket > > daemon: Create parent directory for unix socket > > cmake: Correct added subdirectories > > console: Add cmake options for control and timestamp > > tests: Adapt to DLT_DISABLE_MACRO > > header: Adapt to DLT_DISABLE_MACRO > > include: Refactor CMakeLists.txt > > gtest: Change script name to gtest_dlt_daemon_offline_log.sh > > daemon: Enable to use FIFO on QNX > > tests: Add new test case with given buffer > > tests: Enable macro disabling > > lib: Add new interfaces with given buffer Implemention of tests for > > the dlt-qnx-system module > > lib: Add MaxFileSize handling > > client: pthread_join for deinit > > doc: update initial log level document > > dlt-system: Fix memory leak in dlt-system config > > dlt_common: remove duplicate stdbool header > > dlt-control: Add option to config port > > system: use signalfd for dlt-system > > console: provides args option to enable send/receive serial header fix > > malformed printf format strings (#295) > > cmake: Set WITH_LEGACY_INCLUDE_PATH to ON as default (#334) Make > the > > legacy include path a CMake option (#332) > > daemon: Call dlt_daemon_configuration_load() properly (#330) > > dlt_user: Use pthread_setname_np() if available (#326) > > libdlt: Add legacy include path in exported CMake config file (#327) > > lib: Set TYLE to 1 for BOOL type (#320) > > file-transfer: Abort file transfer if get serial number failed > > dlt_user.c: fixing casting wrong type > > dlt-sortbytimestamp: Remove duplicated conditional statements code > > dlt-convert: Remove duplicated conditional statements code > > doc: Minor fix in dlt_for_developers.md (#321) > > dlt-control-common.c: Fix build failure due to out-of-bound write > > -Werror=stringop-truncation Extend include path in *.pc file (#319) > > > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > > --- > > .../dlt-daemon/dlt-daemon/317.patch | 43 ------------------- > > ...-daemon_2.18.7.bb => dlt-daemon_2.18.8.bb} | 9 ++-- > > 2 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 > > meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch > > rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.7.bb > => > > dlt-daemon_2.18.8.bb} (93%) > > > > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch > > b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch > > deleted file mode 100644 > > index fe40334b6..000000000 > > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch > > +++ /dev/null > > @@ -1,43 +0,0 @@ > > -Origin: https://github.com/GENIVI/dlt-daemon/pull/317 > > -From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 > 00:00:00 > > 2001 > > -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> > > -Date: Thu, 1 Jul 2021 12:58:20 +0200 > > -Subject: [PATCH] dlt-control-common.c: Fix build failure due to > > out-of-bound > > - write -Werror=stringop-truncation > > - > > -cd > /build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/src/console/logstorage && > /usr/bin/cc -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 -I/build/dlt-daemon-2.18.7 > -I/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/include/dlt > -I/build/dlt-daemon-2.18.7/include/dlt > -I/build/dlt-daemon-2.18.7/src/shared > -I/build/dlt-daemon-2.18.7/src/core_dump_handler > -I/build/dlt-daemon-2.18.7/src/offlinelogstorage > -I/build/dlt-daemon-2.18.7/src/lib -I/build/dlt-daemon-2.18.7/src/daemon > -I/build/dlt-daemon-2.18.7/src/console > -I/build/dlt-daemon-2.18.7/src/gateway > -I/build/dlt-daemon-2.18.7/systemd/3rdparty -g -O2 > -ffile-prefix-map=/build/dlt-daemon-2.18.7=. -fstack-protector-strong > -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 > -Werror -std=gnu99 -Wall -Wextra -Wno-variadic-macros > -Wno-strict-aliasing -o > CMakeFiles/dlt-logstorage-ctrl.dir/__/dlt-control-common.c.o -c > /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c > > -make[3]: Leaving directory > '/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu' > > -In file included from /usr/include/string.h:495, > > - from > /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:56: > > -In function 'strncpy', > > - inlined from 'dlt_json_filter_load' at > /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:716:13: > > -/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: > '__builtin_strncpy' specified bound 4 equals destination size > [-Werror=stringop-truncation] > > - 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos > (__dest)); > > - | > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > -In function 'strncpy', > > - inlined from 'dlt_json_filter_load' at > /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:721:13: > > -/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: > '__builtin_strncpy' specified bound 4 equals destination size > [-Werror=stringop-truncation] > > - 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos > (__dest)); > > - | > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > - > > -Signed-off-by: Gianfranco Costamagna > <costamagnagianfranco@yahoo.it> > > -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> > > ---- > > - src/console/dlt-control-common.c | 4 ++-- > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > - > > -diff --git a/src/console/dlt-control-common.c > > b/src/console/dlt-control-common.c > > -index 8a9d29f0..f58d8268 100644 > > ---- a/src/console/dlt-control-common.c > > -+++ b/src/console/dlt-control-common.c > > -@@ -671,8 +671,8 @@ DltReturnValue dlt_json_filter_load(DltFilter > *filter, const char *filename, int > > - struct json_object *j_payload_max; > > - enum json_tokener_error jerr; > > - > > -- char app_id[DLT_ID_SIZE] = ""; > > -- char context_id[DLT_ID_SIZE] = ""; > > -+ char app_id[DLT_ID_SIZE + 1] = ""; > > -+ char context_id[DLT_ID_SIZE + 1] = ""; > > - int32_t log_level = 0; > > - int32_t payload_max = INT32_MAX; > > - int32_t payload_min = 0; > > diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb > > b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb > > similarity index 93% > > rename from > meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb > > rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb > > index e5a3c7c29..fc90d30b8 100644 > > --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb > > +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb > > @@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = > "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" > > DEPENDS = "zlib gzip-native json-c" > > > > SRC_URI = > "git://github.com/GENIVI/${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://317.patch \ > > -" > > -SRCREV = "24d197214bfdcec7430d31b42e5c87df27287aaf" > > + > file://0002-Don-t-execute-processes-as-a-specific-user.patch \ > > + file://0004-Modify-systemd-config-directory.patch \ > > + " > > +SRCREV = "1438fcf8c88cd47b20b2984180a8457c3eb9193d" > > > > S = "${WORKDIR}/git" > > > > -- > > 2.25.1 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#94960): > > https://lists.openembedded.org/g/openembedded-devel/message/94960 > > Mute This Topic: https://lists.openembedded.org/mt/88573650/1997914 > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > Unsubscribe: > https://lists.openembedded.org/g/openembedded-devel/unsub > > [raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch deleted file mode 100644 index fe40334b6..000000000 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch +++ /dev/null @@ -1,43 +0,0 @@ -Origin: https://github.com/GENIVI/dlt-daemon/pull/317 -From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Thu, 1 Jul 2021 12:58:20 +0200 -Subject: [PATCH] dlt-control-common.c: Fix build failure due to out-of-bound - write -Werror=stringop-truncation - -cd /build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/src/console/logstorage && /usr/bin/cc -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 -I/build/dlt-daemon-2.18.7 -I/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/include/dlt -I/build/dlt-daemon-2.18.7/include/dlt -I/build/dlt-daemon-2.18.7/src/shared -I/build/dlt-daemon-2.18.7/src/core_dump_handler -I/build/dlt-daemon-2.18.7/src/offlinelogstorage -I/build/dlt-daemon-2.18.7/src/lib -I/build/dlt-daemon-2.18.7/src/daemon -I/build/dlt-daemon-2.18.7/src/console -I/build/dlt-daemon-2.18.7/src/gateway -I/build/dlt-daemon-2.18.7/systemd/3rdparty -g -O2 -ffile-prefix-map=/build/dlt-daemon-2.18.7=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Werror -std=gnu99 -Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -o CMakeFiles/dlt-logstorage-ctrl.dir/__/dlt-control-common.c.o -c /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c -make[3]: Leaving directory '/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu' -In file included from /usr/include/string.h:495, - from /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:56: -In function 'strncpy', - inlined from 'dlt_json_filter_load' at /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:716:13: -/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] - 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In function 'strncpy', - inlined from 'dlt_json_filter_load' at /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:721:13: -/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] - 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> ---- - src/console/dlt-control-common.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c -index 8a9d29f0..f58d8268 100644 ---- a/src/console/dlt-control-common.c -+++ b/src/console/dlt-control-common.c -@@ -671,8 +671,8 @@ DltReturnValue dlt_json_filter_load(DltFilter *filter, const char *filename, int - struct json_object *j_payload_max; - enum json_tokener_error jerr; - -- char app_id[DLT_ID_SIZE] = ""; -- char context_id[DLT_ID_SIZE] = ""; -+ char app_id[DLT_ID_SIZE + 1] = ""; -+ char context_id[DLT_ID_SIZE + 1] = ""; - int32_t log_level = 0; - int32_t payload_max = INT32_MAX; - int32_t payload_min = 0; diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb similarity index 93% rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb index e5a3c7c29..fc90d30b8 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb @@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "zlib gzip-native json-c" SRC_URI = "git://github.com/GENIVI/${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://317.patch \ -" -SRCREV = "24d197214bfdcec7430d31b42e5c87df27287aaf" + file://0002-Don-t-execute-processes-as-a-specific-user.patch \ + file://0004-Modify-systemd-config-directory.patch \ + " +SRCREV = "1438fcf8c88cd47b20b2984180a8457c3eb9193d" S = "${WORKDIR}/git"
Changelog: ========= lib: Fix wrong type alert from lgtm gtest_dlt_daemon_gateway: fix gtest build failed lib: generate dlt library internal log file tests: add stdlib to dlt_cpp_extension dlt_user: Make dlt_init thread safe remove clang-tidy analyzer warnings: incompatible pointer type debian: improve debian build package dlt-control-common: shutdown and close socket dlt_common: improve function description gtest: Bring-in changes gtest: Rework WORKING_DIRECTORY gtest: Correct data amount in gtest_dlt_common cmake: Set empty to systemd_SRCS gtest: Refactor tests/CMakeLists.txt lib: Add SOCK_CLOEXEC to socket daemon: Create parent directory for unix socket cmake: Correct added subdirectories console: Add cmake options for control and timestamp tests: Adapt to DLT_DISABLE_MACRO header: Adapt to DLT_DISABLE_MACRO include: Refactor CMakeLists.txt gtest: Change script name to gtest_dlt_daemon_offline_log.sh daemon: Enable to use FIFO on QNX tests: Add new test case with given buffer tests: Enable macro disabling lib: Add new interfaces with given buffer Implemention of tests for the dlt-qnx-system module lib: Add MaxFileSize handling client: pthread_join for deinit doc: update initial log level document dlt-system: Fix memory leak in dlt-system config dlt_common: remove duplicate stdbool header dlt-control: Add option to config port system: use signalfd for dlt-system console: provides args option to enable send/receive serial header fix malformed printf format strings (#295) cmake: Set WITH_LEGACY_INCLUDE_PATH to ON as default (#334) Make the legacy include path a CMake option (#332) daemon: Call dlt_daemon_configuration_load() properly (#330) dlt_user: Use pthread_setname_np() if available (#326) libdlt: Add legacy include path in exported CMake config file (#327) lib: Set TYLE to 1 for BOOL type (#320) file-transfer: Abort file transfer if get serial number failed dlt_user.c: fixing casting wrong type dlt-sortbytimestamp: Remove duplicated conditional statements code dlt-convert: Remove duplicated conditional statements code doc: Minor fix in dlt_for_developers.md (#321) dlt-control-common.c: Fix build failure due to out-of-bound write -Werror=stringop-truncation Extend include path in *.pc file (#319) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- .../dlt-daemon/dlt-daemon/317.patch | 43 ------------------- ...-daemon_2.18.7.bb => dlt-daemon_2.18.8.bb} | 9 ++-- 2 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.7.bb => dlt-daemon_2.18.8.bb} (93%)