From afdbef77d3f4e13bd71c404181b924ffe2227edd Mon Sep 17 00:00:00 2001 From: Thuy Tran Date: Tue, 17 Jul 2018 17:48:52 +0700 Subject: rcar-gen3: optee-client: WORKAROUND to build with GCC 8.1 This commit applies a W/A patch from optee upstream to fix GCC 8 format-truncation errors. [1] https://github.com/OP-TEE/optee_client/issues/126 Signed-off-by: Thuy Tran Signed-off-by: Takamitsu Honda --- ...c_trace.c-snprintf-Werror-format-truncati.patch | 28 ++++++++++++++++++++++ .../recipes-bsp/optee/optee-client_git.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch (limited to 'meta-rcar-gen3/recipes-bsp/optee') diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch b/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch new file mode 100644 index 0000000..db8bdac --- /dev/null +++ b/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch @@ -0,0 +1,28 @@ +From 30dd2986fb64aba7ee78d4e231c344e2c39d7999 Mon Sep 17 00:00:00 2001 +From: Simon Hughes +Date: Thu, 21 Jun 2018 17:22:23 +0100 +Subject: [PATCH] Fix for teec_trace.c snprintf -Werror=format-truncation= + error. + +Signed-off-by: Simon Hughes +--- + libteec/src/teec_trace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libteec/src/teec_trace.c b/libteec/src/teec_trace.c +index 78b79d6..c91bc43 100644 +--- a/libteec/src/teec_trace.c ++++ b/libteec/src/teec_trace.c +@@ -106,7 +106,8 @@ int _dprintf(const char *function, int flen, int line, int level, + */ + int thread_id = syscall(SYS_gettid); /* perf issue ? */ + +- snprintf(prefixed, MAX_PRINT_SIZE, ++ int len = 0; ++ len = snprintf(prefixed+len, MAX_PRINT_SIZE, + "%s [%d] %s:%s:%d: %s", + trace_level_strings[level], thread_id, prefix, func, + line, raw); +-- +2.7.4 + diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb b/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb index 2105900..727e8d5 100644 --- a/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb +++ b/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb @@ -10,6 +10,7 @@ SRCREV = "3f16662284a69fdec97b1712064be94d1fed7ae7" SRC_URI += " \ file://optee.service \ + file://0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch \ " inherit pythonnative systemd -- cgit 1.2.3-korg