From 572d90d55afeb1c1fb8db95747e2ba00e0bb7cfc Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Fri, 23 Aug 2024 14:13:22 +0300 Subject: optee: Upgrade optee recipes from 4.0.0.imx to 4.2.0.imx Update file headers Signed-off-by: Valentin Jec (cherry picked from commit 79fd80f199084f5dd980f6b754d167a793fef2c6) --- recipes-security/optee-imx/optee-client-fslc-imx.inc | 2 +- recipes-security/optee-imx/optee-client-fslc.inc | 2 +- recipes-security/optee-imx/optee-client_4.0.0.imx.bb | 7 ------- recipes-security/optee-imx/optee-client_4.2.0.imx.bb | 7 +++++++ recipes-security/optee-imx/optee-os_4.0.0.imx.bb | 12 ------------ recipes-security/optee-imx/optee-os_4.2.0.imx.bb | 12 ++++++++++++ recipes-security/optee-imx/optee-test_4.0.0.imx.bb | 10 ---------- recipes-security/optee-imx/optee-test_4.2.0.imx.bb | 10 ++++++++++ 8 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 recipes-security/optee-imx/optee-client_4.0.0.imx.bb create mode 100644 recipes-security/optee-imx/optee-client_4.2.0.imx.bb delete mode 100644 recipes-security/optee-imx/optee-os_4.0.0.imx.bb create mode 100644 recipes-security/optee-imx/optee-os_4.2.0.imx.bb delete mode 100644 recipes-security/optee-imx/optee-test_4.0.0.imx.bb create mode 100644 recipes-security/optee-imx/optee-test_4.2.0.imx.bb diff --git a/recipes-security/optee-imx/optee-client-fslc-imx.inc b/recipes-security/optee-imx/optee-client-fslc-imx.inc index 4cfe18bf8..60e9e1fa5 100644 --- a/recipes-security/optee-imx/optee-client-fslc-imx.inc +++ b/recipes-security/optee-imx/optee-client-fslc-imx.inc @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2021 NXP +# Copyright 2017-2024 NXP require optee-client-fslc.inc diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc index 92f9f1d1f..aca2aff6c 100644 --- a/recipes-security/optee-imx/optee-client-fslc.inc +++ b/recipes-security/optee-imx/optee-client-fslc.inc @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2021 NXP +# Copyright 2017-2024 NXP SUMMARY = "OPTEE Client libs" HOMEPAGE = "http://www.optee.org/" diff --git a/recipes-security/optee-imx/optee-client_4.0.0.imx.bb b/recipes-security/optee-imx/optee-client_4.0.0.imx.bb deleted file mode 100644 index b404dd5b7..000000000 --- a/recipes-security/optee-imx/optee-client_4.0.0.imx.bb +++ /dev/null @@ -1,7 +0,0 @@ -require optee-client-fslc-imx.inc - -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee" - -DEPENDS += "util-linux" -EXTRA_OEMAKE += "PKG_CONFIG=pkg-config" diff --git a/recipes-security/optee-imx/optee-client_4.2.0.imx.bb b/recipes-security/optee-imx/optee-client_4.2.0.imx.bb new file mode 100644 index 000000000..64b49b752 --- /dev/null +++ b/recipes-security/optee-imx/optee-client_4.2.0.imx.bb @@ -0,0 +1,7 @@ +require optee-client-fslc-imx.inc + +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0" + +DEPENDS += "util-linux" +EXTRA_OEMAKE += "PKG_CONFIG=pkg-config" diff --git a/recipes-security/optee-imx/optee-os_4.0.0.imx.bb b/recipes-security/optee-imx/optee-os_4.0.0.imx.bb deleted file mode 100644 index ad6c6b406..000000000 --- a/recipes-security/optee-imx/optee-os_4.0.0.imx.bb +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2017-2021 NXP - -require optee-os-fslc-imx.inc - -SRC_URI += " \ - file://0001-core-Define-section-attributes-for-clang.patch \ - file://0002-optee-enable-clang-support.patch \ - file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \ - file://0004-core-link-add-no-warn-rwx-segments.patch \ -" -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "e0a3e77735941e6057a1994a576b83a93ea0bdb9" diff --git a/recipes-security/optee-imx/optee-os_4.2.0.imx.bb b/recipes-security/optee-imx/optee-os_4.2.0.imx.bb new file mode 100644 index 000000000..96948bc7b --- /dev/null +++ b/recipes-security/optee-imx/optee-os_4.2.0.imx.bb @@ -0,0 +1,12 @@ +# Copyright 2017-2024 NXP + +require optee-os-fslc-imx.inc + +SRC_URI += " \ + file://0001-core-Define-section-attributes-for-clang.patch \ + file://0002-optee-enable-clang-support.patch \ + file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \ + file://0004-core-link-add-no-warn-rwx-segments.patch \ +" +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "c6be5b572452a2808d1a34588fd10e71715e23cf" diff --git a/recipes-security/optee-imx/optee-test_4.0.0.imx.bb b/recipes-security/optee-imx/optee-test_4.0.0.imx.bb deleted file mode 100644 index 1717a713f..000000000 --- a/recipes-security/optee-imx/optee-test_4.0.0.imx.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2017-2021 NXP - -require optee-test-fslc.inc - -SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}" - -SRCBRANCH = "lf-6.6.3_1.0.0" -SRCREV = "95c49d950f50fa774e4530d19a967079b3b61279" - -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-security/optee-imx/optee-test_4.2.0.imx.bb b/recipes-security/optee-imx/optee-test_4.2.0.imx.bb new file mode 100644 index 000000000..aa8444fba --- /dev/null +++ b/recipes-security/optee-imx/optee-test_4.2.0.imx.bb @@ -0,0 +1,10 @@ +# Copyright 2017-2024 NXP + +require optee-test-fslc.inc + +SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}" + +SRCBRANCH = "lf-6.6.23_2.0.0" +SRCREV = "07682f1b1b41ec0bfa507286979b36ab8d344a96" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf