diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2021-03-16 07:43:20 -0500 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-03-16 17:59:36 -0300 |
commit | be6a39f2faf605330a0ae9a33430e1112ac4d3f5 (patch) | |
tree | 09d4708a0429b8fdecfca792f4af6add4c8467fb /recipes-security/optee-imx/optee-test/0001-use-python3-instead-of-python.patch | |
parent | 1d2f65637442c1f52967001e539c5d44c1ba74cd (diff) | |
download | meta-freescale-be6a39f2faf605330a0ae9a33430e1112ac4d3f5.tar.gz |
optee-imx: Upgrade to 3.10.0
Update all recipes to pull sources from imx_5.4.70_2.3.0 branch in NXP
upstream and update SRCREV to match release tags.
Update PREFERRED_VERSION of optee for mx8 to point to 3.10.0.imx.
Following notes are additions to the version update of recipes:
--------------------------
optee-client:
- Drop CFLAGS patch as it is already applied upstream
optee-os:
- Drop gcc10 patch as it is already applied upstream
- Add dependency on python3-pycryptodomex-native
- Drop NOWERROR flag as package is reworked to disable warnings by default
- Rework mkimage load address since tee-init_load_addr.txt is no longer created
optee-test:
- Drop python3 patch as it is already applied upstream
- Remove unused patch files from layer
- Add dependency on python3-pycryptodomex-native
- Add sysroot to C and C++ flags
Fixes #686, fixes #689.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-security/optee-imx/optee-test/0001-use-python3-instead-of-python.patch')
-rw-r--r-- | recipes-security/optee-imx/optee-test/0001-use-python3-instead-of-python.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-security/optee-imx/optee-test/0001-use-python3-instead-of-python.patch b/recipes-security/optee-imx/optee-test/0001-use-python3-instead-of-python.patch deleted file mode 100644 index 20f190af..00000000 --- a/recipes-security/optee-imx/optee-test/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 | |||