diff options
author | Zelan Zou <zelan.zou@nxp.com> | 2025-09-01 14:16:03 +0800 |
---|---|---|
committer | Zelan Zou <zelan.zou@nxp.com> | 2025-09-03 10:57:15 +0800 |
commit | 37ffaf77203c67d2b0eeeca60fb4cbde7c92de75 (patch) | |
tree | 29c69bfe339e3c4111d7e205ae6c8f3eaae7db3a | |
parent | 6bd8f2a6c2495ca7857aead0578776efa2e165c3 (diff) | |
download | meta-freescale-37ffaf77203c67d2b0eeeca60fb4cbde7c92de75.tar.gz |
optee-test: Upgrade 4.4.0.imx -> 4.6.0.imx
Update from LF6.12.20-2.0.0
Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
-rw-r--r-- | recipes-security/optee-imx/optee-test-fslc-imx.inc | 4 | ||||
-rw-r--r-- | recipes-security/optee-imx/optee-test-fslc.inc | 3 | ||||
-rw-r--r-- | recipes-security/optee-imx/optee-test_4.6.0.imx.bb (renamed from recipes-security/optee-imx/optee-test_4.4.0.imx.bb) | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/recipes-security/optee-imx/optee-test-fslc-imx.inc b/recipes-security/optee-imx/optee-test-fslc-imx.inc index ab16fd221..b4bb6031b 100644 --- a/recipes-security/optee-imx/optee-test-fslc-imx.inc +++ b/recipes-security/optee-imx/optee-test-fslc-imx.inc | |||
@@ -1,6 +1,5 @@ | |||
1 | # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-test-imx.inc. | 1 | # Copied from meta-imx/meta-imx-bsp/recipes-security/optee/optee-test-imx.inc. |
2 | # See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-scarthgap/imx-6.6.52-2.2.0.xml#L37 | 2 | # See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L37 |
3 | |||
4 | require optee-test-fslc.inc | 3 | require optee-test-fslc.inc |
5 | 4 | ||
6 | DEPENDS += "openssl" | 5 | DEPENDS += "openssl" |
@@ -14,5 +13,6 @@ OPTEE_TEST_SRC ?= "git://github.com/nxp-imx/imx-optee-test.git;protocol=https" | |||
14 | 13 | ||
15 | EXTRA_OEMAKE:append:libc-musl = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" | 14 | EXTRA_OEMAKE:append:libc-musl = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" |
16 | CFLAGS:append:libc-musl = " -Wno-error=deprecated-declarations" | 15 | CFLAGS:append:libc-musl = " -Wno-error=deprecated-declarations" |
16 | CFLAGS += " -Wno-error=unterminated-string-initialization" | ||
17 | 17 | ||
18 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | 18 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-security/optee-imx/optee-test-fslc.inc b/recipes-security/optee-imx/optee-test-fslc.inc index ed64c87f8..46d57ac41 100644 --- a/recipes-security/optee-imx/optee-test-fslc.inc +++ b/recipes-security/optee-imx/optee-test-fslc.inc | |||
@@ -1,12 +1,11 @@ | |||
1 | # Copied from meta-arm/recipes-security/optee/optee-test.inc. | 1 | # Copied from meta-arm/recipes-security/optee/optee-test.inc. |
2 | # See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-scarthgap/imx-6.6.52-2.2.0.xml#L30 | 2 | # See:https://github.com/nxp-imx/imx-manifest/blob/imx-linux-walnascar/imx-6.12.20-2.0.0.xml#L30 |
3 | 3 | ||
4 | SUMMARY = "OP-TEE sanity testsuite" | 4 | SUMMARY = "OP-TEE sanity testsuite" |
5 | DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite" | 5 | DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite" |
6 | HOMEPAGE = "https://www.op-tee.org/" | 6 | HOMEPAGE = "https://www.op-tee.org/" |
7 | 7 | ||
8 | LICENSE = "BSD-2-Clause & GPL-2.0-only" | 8 | LICENSE = "BSD-2-Clause & GPL-2.0-only" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" | ||
10 | 9 | ||
11 | inherit python3native ptest | 10 | inherit python3native ptest |
12 | inherit deploy | 11 | inherit deploy |
diff --git a/recipes-security/optee-imx/optee-test_4.4.0.imx.bb b/recipes-security/optee-imx/optee-test_4.6.0.imx.bb index b4ac12714..78e933486 100644 --- a/recipes-security/optee-imx/optee-test_4.4.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_4.6.0.imx.bb | |||
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \ | |||
9 | file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d" | 9 | file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d" |
10 | 10 | ||
11 | 11 | ||
12 | SRCBRANCH = "lf-6.6.52_2.2.0" | 12 | SRCBRANCH = "lf-6.12.20_2.0.0" |
13 | SRCREV = "dafc98ed8364d7281a9a7f0788dd0a2067844a59" | 13 | SRCREV = "010f088f05b5ebf392c6e235d6e53d391755722f" |