diff options
Diffstat (limited to 'recipes-security/optee/optee-test-qoriq')
| -rw-r--r-- | recipes-security/optee/optee-test-qoriq/0001-fix-build-failure-with-GCC-9.patch | 28 | ||||
| -rw-r--r-- | recipes-security/optee/optee-test-qoriq/0001-use-python3-instead-of-python.patch | 48 |
2 files changed, 0 insertions, 76 deletions
diff --git a/recipes-security/optee/optee-test-qoriq/0001-fix-build-failure-with-GCC-9.patch b/recipes-security/optee/optee-test-qoriq/0001-fix-build-failure-with-GCC-9.patch deleted file mode 100644 index 9b9127777..000000000 --- a/recipes-security/optee/optee-test-qoriq/0001-fix-build-failure-with-GCC-9.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From 79330c8383e02e91a355964a3cc7b932d03c2517 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chunrong Guo <chunrong.guo@nxp.com> | ||
| 3 | Date: Wed, 10 Jul 2019 11:09:01 +0200 | ||
| 4 | Subject: [PATCH] fix build failure with GCC 9 | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [embedded specific] | ||
| 7 | |||
| 8 | Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com> | ||
| 9 | --- | ||
| 10 | host/xtest/Makefile | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/host/xtest/Makefile b/host/xtest/Makefile | ||
| 14 | index e4e2881..e86e056 100644 | ||
| 15 | --- a/host/xtest/Makefile | ||
| 16 | +++ b/host/xtest/Makefile | ||
| 17 | @@ -152,7 +152,7 @@ CFLAGS += -Wall -Wcast-align -Werror \ | ||
| 18 | -Wmissing-include-dirs -Wmissing-noreturn \ | ||
| 19 | -Wmissing-prototypes -Wnested-externs -Wpointer-arith \ | ||
| 20 | -Wshadow -Wstrict-prototypes -Wswitch-default \ | ||
| 21 | - -Wwrite-strings \ | ||
| 22 | + -Wwrite-strings -Wno-format-overflow \ | ||
| 23 | -Wno-missing-field-initializers -Wno-format-zero-length | ||
| 24 | endif | ||
| 25 | |||
| 26 | -- | ||
| 27 | 2.7.4 | ||
| 28 | |||
diff --git a/recipes-security/optee/optee-test-qoriq/0001-use-python3-instead-of-python.patch b/recipes-security/optee/optee-test-qoriq/0001-use-python3-instead-of-python.patch deleted file mode 100644 index 20f190af9..000000000 --- a/recipes-security/optee/optee-test-qoriq/0001-use-python3-instead-of-python.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | From 6271160639002a2580d80b75b5397a96d56329f2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Scott Branden <scott.branden@broadcom.com> | ||
| 3 | Date: Fri, 27 Dec 2019 12:54:28 -0800 | ||
| 4 | Subject: [PATCH] use python3 instead of python | ||
| 5 | |||
| 6 | use python3 instead of python as python2 is EOL January 2020. | ||
| 7 | |||
| 8 | Signed-off-by: Scott Branden <scott.branden@broadcom.com> | ||
| 9 | Reviewed-by: Jerome Forissier <jerome@forissier.org> | ||
| 10 | Tested-by: Jerome Forissier <jerome@forissier.org> (QEMU, CFG_GCM_NIST_VECTORS=y) | ||
| 11 | Upstream-Status: Backport from v3.8.0 | ||
| 12 | --- | ||
| 13 | scripts/file_to_c.py | 4 ++-- | ||
| 14 | scripts/rsp_to_gcm_test.py | 2 +- | ||
| 15 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py | ||
| 18 | index ae16f52..b4ce2a2 100755 | ||
| 19 | --- a/scripts/file_to_c.py | ||
| 20 | +++ b/scripts/file_to_c.py | ||
| 21 | @@ -1,4 +1,4 @@ | ||
| 22 | -#!/usr/bin/env python | ||
| 23 | +#!/usr/bin/env python3 | ||
| 24 | # SPDX-License-Identifier: BSD-2-Clause | ||
| 25 | # | ||
| 26 | # Copyright (c) 2018, Linaro Limited | ||
| 27 | @@ -29,7 +29,7 @@ def main(): | ||
| 28 | |||
| 29 | f.write("const uint8_t " + args.name + "[] = {\n") | ||
| 30 | i = 0 | ||
| 31 | - for x in array.array("B", inf.read()): | ||
| 32 | + for x in array.array("B", map(ord, (inf.read()))): | ||
| 33 | f.write("0x" + '{0:02x}'.format(x) + ",") | ||
| 34 | i = i + 1 | ||
| 35 | if i % 8 == 0: | ||
| 36 | diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py | ||
| 37 | index 0543541..e4418be 100755 | ||
| 38 | --- a/scripts/rsp_to_gcm_test.py | ||
| 39 | +++ b/scripts/rsp_to_gcm_test.py | ||
| 40 | @@ -1,4 +1,4 @@ | ||
| 41 | -#!/usr/bin/env python | ||
| 42 | +#!/usr/bin/env python3 | ||
| 43 | |||
| 44 | modes = {'encrypt': 0, 'decrypt': 1} | ||
| 45 | |||
| 46 | -- | ||
| 47 | 2.7.4 | ||
| 48 | |||
