Skip to contentSkip to conversation

arm/optee: Upgrade from 3.14 to 3.16

PATCH Applied Alejandro Enedino Hernandez Samaniego 8 participants 21 messages Feb 26, 2022 – Mar 23, 2022 2 messages not in the archive

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm/optee: Upgrade from 3.14 to 3.16

- Removes upstreamed patches for optee-examples
- Fixes optee-examples installation
- Includes new python3-cryptography dependency
- Fixes python3-cryptography to work with openssl

Tested on qemuarm64-secureboot via optee-examples xtest -l 15

---
 ....bbappend => optee-client_3.16.0.bbappend} |  0
 ...pend => optee-os-tadevkit_3.16.0.bbappend} |  0
 ...14.0.bbappend => optee-os_3.16.0.bbappend} |  0
 ....0.bbappend => optee-test_3.16.0.bbappend} |  0
 .../optee-ftpm/optee-ftpm_git.bb              |  8 +-
 .../optee/optee-client_3.14.0.bb              |  3 -
 .../optee/optee-client_3.16.0.bb              |  3 +
 .../recipes-security/optee/optee-examples.inc |  7 +-
 ...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++
 ...efault-cross-compiler-environment-se.patch | 84 -------------------
 ...nable-plugins-installation-in-rootfs.patch | 37 --------
 .../optee/optee-examples_3.14.0.bb            |  4 -
 .../optee/optee-examples_3.16.0.bb            |  3 +
 ..._3.14.0.bb => optee-os-tadevkit_3.16.0.bb} |  3 +-
 meta-arm/recipes-security/optee/optee-os.inc  |  2 +-
 ...{optee-os_3.14.0.bb => optee-os_3.16.0.bb} |  2 +-
 .../recipes-security/optee/optee-test.inc     |  2 +-
 .../optee/optee-test_3.14.0.bb                |  3 -
 .../optee/optee-test_3.16.0.bb                |  3 +
 meta-arm/recipes-security/optee/optee.inc     |  3 +
 20 files changed, 73 insertions(+), 140 deletions(-)
 rename meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bbappend => optee-client_3.16.0.bbappend} (100%)
 rename meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14.0.bbappend => optee-os-tadevkit_3.16.0.bbappend} (100%)
 rename meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappend => optee-os_3.16.0.bbappend} (100%)
 rename meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbappend => optee-test_3.16.0.bbappend} (100%)
 delete mode 100644 meta-arm/recipes-security/optee/optee-client_3.14.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-client_3.16.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch
 delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch
 delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch
 delete mode 100644 meta-arm/recipes-security/optee/optee-examples_3.14.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-examples_3.16.0.bb
 rename meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.bb => optee-os-tadevkit_3.16.0.bb} (94%)
 rename meta-arm/recipes-security/optee/{optee-os_3.14.0.bb => optee-os_3.16.0.bb} (76%)
 delete mode 100644 meta-arm/recipes-security/optee/optee-test_3.14.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-test_3.16.0.bb
meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +7 -1
index f2a74da..0eb64cd 100644
@@ -15,7 +15,9 @@ inherit deploy python3native
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5"
 
-DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit"
+DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit \
+    python3-cryptography-native \
+    "
 
 FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
 
@@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall = "\
     CFG_ARM64_ta_arm64=y \
 "
 
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
+
 PARALLEL_MAKE = ""
 
 do_compile() {
meta-arm/recipes-security/optee/optee-client_3.14.0.bb deleted +0 -3
deleted file mode 100644
index be78b88..0000000
@@ -1,3 +0,0 @@
-require optee-client.inc
-
-SRCREV = "06e1b32f6a7028e039c625b07cfc25fda0c17d53"
meta-arm/recipes-security/optee/optee-client_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..4a36cbc
@@ -0,0 +1,3 @@
+require optee-client.inc
+
+SRCREV = "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"
meta-arm/recipes-security/optee/optee-examples.inc +3 -4
index 656722e..097f892 100644
@@ -5,16 +5,14 @@ HOMEPAGE = "https://github.com/linaro-swg/optee_examples"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
 
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
 
 inherit python3native
 
 require optee.inc
 
 SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https \
-           file://0001-plugins-Honour-default-cross-compiler-environment-se.patch \
-           file://0002-Makefile-Enable-plugins-installation-in-rootfs.patch \
-          "
+           file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch"
 
 EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
                  HOST_CROSS_COMPILE=${HOST_PREFIX} \
@@ -25,6 +23,7 @@ EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
+
 do_compile() {
     oe_runmake -C ${S}
 }
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +46 -0

46 lines not on this page · raw message

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -84

84 lines not on this page · raw message

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -37
deleted file mode 100644
index 80e6b5f..0000000
@@ -1,37 +0,0 @@
-From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17 00:00:00 2001
-From: Sumit Garg <[email protected]>
-Date: Tue, 20 Jul 2021 14:20:10 +0530
-Subject: [PATCH] Makefile: Enable plugins installation in rootfs
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg <[email protected]>
-
----
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index a275842..9359d95 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,14 +25,19 @@ prepare-for-rootfs: examples
- 	@mkdir -p $(OUTPUT_DIR)
- 	@mkdir -p $(OUTPUT_DIR)/ta
- 	@mkdir -p $(OUTPUT_DIR)/ca
-+	@mkdir -p $(OUTPUT_DIR)/plugins
- 	@for example in $(EXAMPLE_LIST); do \
- 		if [ -e $$example/host/optee_example_$$example ]; then \
- 			cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
- 		fi; \
- 		cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
-+		if [ $$example = plugins ]; then \
-+			cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
-+		fi; \
- 	done
- 
- prepare-for-rootfs-clean:
- 	@rm -rf $(OUTPUT_DIR)/ta
- 	@rm -rf $(OUTPUT_DIR)/ca
-+	@rm -rf $(OUTPUT_DIR)/plugins
- 	@rmdir --ignore-fail-on-non-empty $(OUTPUT_DIR) || test ! -e $(OUTPUT_DIR)
meta-arm/recipes-security/optee/optee-examples_3.14.0.bb deleted +0 -4
deleted file mode 100644
index f2b5f7d..0000000
@@ -1,4 +0,0 @@
-require optee-examples.inc
-
-SRCREV = "e9c870525af8f7e7fccf575a0ca5394ce55adcec"
-
meta-arm/recipes-security/optee/optee-examples_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..b5f6269
@@ -0,0 +1,3 @@
+require optee-examples.inc
+
+SRCREV = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +2 -1
similarity index 94%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb
index 0d37a52..c710e27 100644
@@ -1,10 +1,11 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
-require optee-os_3.14.0.bb
+require optee-os_3.16.0.bb
 
 SUMMARY = "OP-TEE Trusted OS TA devkit"
 DESCRIPTION = "OP-TEE TA devkit for build TAs"
 HOMEPAGE = "https://www.op-tee.org/"
 
+
 do_install() {
     #install TA devkit
     install -d ${D}${includedir}/optee/export-user_ta/
meta-arm/recipes-security/optee/optee-os.inc +1 -1
index 1506a58..57c64fd 100644
@@ -10,7 +10,7 @@ require optee.inc
 
 CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 
-DEPENDS = "python3-pycryptodome-native python3-pyelftools-native"
+DEPENDS = "python3-pycryptodome-native python3-pyelftools-native python3-cryptography-native"
 
 DEPENDS:append:toolchain-clang = " compiler-rt"
 
meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +1 -1
similarity index 76%
rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb
index 95d82bb..873e964 100644
@@ -1,6 +1,6 @@
 require optee-os.inc
 
-SRCREV = "d21befa5e53eae9db469eba1685f5aa5c6f92c2f"
+SRCREV = "d0b742d1564834dac903f906168d7357063d5459"
 
 SRC_URI:append = " \
     file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
meta-arm/recipes-security/optee/optee-test.inc +1 -1
index aada243..33eda29 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 inherit python3native ptest
 require optee.inc
 
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
 
 SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
            file://run-ptest \
meta-arm/recipes-security/optee/optee-test_3.14.0.bb deleted +0 -3
deleted file mode 100644
index 6367c27..0000000
@@ -1,3 +0,0 @@
-require optee-test.inc
-
-SRCREV = "f2eb88affbb7f028561b4fd5cbd049d5d704f741"
meta-arm/recipes-security/optee/optee-test_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..03f9c34
@@ -0,0 +1,3 @@
+require optee-test.inc
+
+SRCREV = "1cf0e6d2bdd1145370033d4e182634458528579d"
meta-arm/recipes-security/optee/optee.inc +3 -0
index f02a022..beae366 100644
@@ -26,3 +26,6 @@ EXTRA_OEMAKE += "V=1 \
                  OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                  TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
                 "
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
Signature · 1 line
2.25.1
#1 lore raw
Quoted 6 lines · Alejandro Enedino Hernandez Samaniego

- Removes upstreamed patches for optee-examples
- Fixes optee-examples installation
- Includes new python3-cryptography dependency
- Fixes python3-cryptography to work with openssl

Tested on qemuarm64-secureboot via optee-examples xtest -l 15

With the new changes in python3-crypto, this is no longer working. I'm seeing the following error in CI.

--- Error summary ---
ERROR: Nothing PROVIDES 'python3-cryptography-native' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee/optee-os_3.16.0.bb DEPENDS on or otherwise requires it). Close matches:
python3-cython-native
python3-pycryptodome-native
python3-typogrify-native

I _think_ that adding meta-openembedded.yml being adding to the machines should fix it, but I'm not sure that is the right solution.

Thanks,
Jon

Quoted 429 lines
---
 ....bbappend => optee-client_3.16.0.bbappend} |  0
 ...pend => optee-os-tadevkit_3.16.0.bbappend} |  0
 ...14.0.bbappend => optee-os_3.16.0.bbappend} |  0
 ....0.bbappend => optee-test_3.16.0.bbappend} |  0
 .../optee-ftpm/optee-ftpm_git.bb              |  8 +-
 .../optee/optee-client_3.14.0.bb              |  3 -
 .../optee/optee-client_3.16.0.bb              |  3 +
 .../recipes-security/optee/optee-examples.inc |  7 +-
 ...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++
 ...efault-cross-compiler-environment-se.patch | 84 -------------------
 ...nable-plugins-installation-in-rootfs.patch | 37 --------
 .../optee/optee-examples_3.14.0.bb            |  4 -
 .../optee/optee-examples_3.16.0.bb            |  3 +
 ..._3.14.0.bb => optee-os-tadevkit_3.16.0.bb} |  3 +-
 meta-arm/recipes-security/optee/optee-os.inc  |  2 +-
 ...{optee-os_3.14.0.bb => optee-os_3.16.0.bb} |  2 +-
 .../recipes-security/optee/optee-test.inc     |  2 +-
 .../optee/optee-test_3.14.0.bb                |  3 -
 .../optee/optee-test_3.16.0.bb                |  3 +
 meta-arm/recipes-security/optee/optee.inc     |  3 +
 20 files changed, 73 insertions(+), 140 deletions(-)
 rename meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bbappend => optee-client_3.16.0.bbappend} (100%)
 rename meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14.0.bbappend => optee-os-tadevkit_3.16.0.bbappend} (100%)
 rename meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappend => optee-os_3.16.0.bbappend} (100%)
 rename meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbappend => optee-test_3.16.0.bbappend} (100%)
 delete mode 100644 meta-arm/recipes-security/optee/optee-client_3.14.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-client_3.16.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch
 delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch
 delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch
 delete mode 100644 meta-arm/recipes-security/optee/optee-examples_3.14.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-examples_3.16.0.bb
 rename meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.bb => optee-os-tadevkit_3.16.0.bb} (94%)
 rename meta-arm/recipes-security/optee/{optee-os_3.14.0.bb => optee-os_3.16.0.bb} (76%)
 delete mode 100644 meta-arm/recipes-security/optee/optee-test_3.14.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-test_3.16.0.bb
meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +7 -1
index f2a74da..0eb64cd 100644
@@ -15,7 +15,9 @@ inherit deploy python3native
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5"
 
-DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit"
+DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit \
+    python3-cryptography-native \
+    "
 
 FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
 
@@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall = "\
     CFG_ARM64_ta_arm64=y \
 "
 
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
+
 PARALLEL_MAKE = ""
 
 do_compile() {
meta-arm/recipes-security/optee/optee-client_3.14.0.bb deleted +0 -3
deleted file mode 100644
index be78b88..0000000
@@ -1,3 +0,0 @@
-require optee-client.inc
-
-SRCREV = "06e1b32f6a7028e039c625b07cfc25fda0c17d53"
meta-arm/recipes-security/optee/optee-client_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..4a36cbc
@@ -0,0 +1,3 @@
+require optee-client.inc
+
+SRCREV = "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"
meta-arm/recipes-security/optee/optee-examples.inc +3 -4
index 656722e..097f892 100644
@@ -5,16 +5,14 @@ HOMEPAGE = "https://github.com/linaro-swg/optee_examples"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
 
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
 
 inherit python3native
 
 require optee.inc
 
 SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https \
-           file://0001-plugins-Honour-default-cross-compiler-environment-se.patch \
-           file://0002-Makefile-Enable-plugins-installation-in-rootfs.patch \
-          "
+           file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch"
 
 EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
                  HOST_CROSS_COMPILE=${HOST_PREFIX} \
@@ -25,6 +23,7 @@ EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
+
 do_compile() {
     oe_runmake -C ${S}
 }
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +46 -0
new file mode 100644
index 0000000..70add62
@@ -0,0 +1,46 @@
+From 11610debf750f15c7a104db7315dcd7d69e282a8 Mon Sep 17 00:00:00 2001
+From: Alejandro Enedino Hernandez Samaniego <[email protected]>
+Date: Sat, 26 Feb 2022 01:52:26 +0000
+Subject: [PATCH] Makefile: Fix non-portable sh check for plugins
+
+Upstream-Status: Pending
+
+We previously held a patch that used "=" for comparison, but when
+that patch got upstreamed it was changed to "==" which is non-portable,
+resulting in an error:
+
+/bin/sh: 6: [: acipher: unexpected operator
+/bin/sh: 6: [: plugins: unexpected operator
+/bin/sh: 6: [: hello_world: unexpected operator
+/bin/sh: 6: [: hotp: unexpected operator
+/bin/sh: 6: [: aes: unexpected operator
+/bin/sh: 6: [: random: unexpected operator
+/bin/sh: 6: [: secure_storage: unexpected operator
+
+if /bin/sh doesnt point to bash.
+
+Which in turn causes our do_install task to fail since plugins arent
+where we expect them to be.
+
+
+Signed-off-by: Alejandro Enedino Hernandez Samaniego <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b3f16aa..9359d95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ prepare-for-rootfs: examples
+ 			cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
+ 		fi; \
+ 		cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
+-		if [ $$example == plugins ]; then \
++		if [ $$example = plugins ]; then \
+ 			cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
+ 		fi; \
+ 	done
+-- 
+2.25.1
+
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -84
deleted file mode 100644
index 033e48c..0000000
@@ -1,84 +0,0 @@
-From 79c826c249001700007a6dffe80c3d61ff4428ef Mon Sep 17 00:00:00 2001
-From: Sumit Garg <[email protected]>
-Date: Tue, 20 Jul 2021 13:54:30 +0530
-Subject: [PATCH 1/2] plugins: Honour default cross compiler environment setup
-
-Honour default $(CC), $(CFLAGS) and $(LDFLAGS) variables. Without this
-plugins example fails to build for OE/Yocto.
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg <[email protected]>
----
- plugins/Makefile        |  2 +-
- plugins/host/Makefile   |  2 +-
- plugins/syslog/Makefile | 16 ++++++++++++----
- 3 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/Makefile b/plugins/Makefile
-index 2372b38..ea472b4 100644
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -8,7 +8,7 @@ TA_CROSS_COMPILE ?= $(CROSS_COMPILE)
- all:
- 	$(MAKE) -C host CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables
- 	$(MAKE) -C ta CROSS_COMPILE="$(TA_CROSS_COMPILE)" LDFLAGS=""
--	$(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)"
-+	$(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables
- 
- .PHONY: clean
- clean:
-diff --git a/plugins/host/Makefile b/plugins/host/Makefile
-index 7285104..76244c7 100644
---- a/plugins/host/Makefile
-+++ b/plugins/host/Makefile
-@@ -20,7 +20,7 @@ BINARY = optee_example_plugins
- all: $(BINARY)
- 
- $(BINARY): $(OBJS)
--	$(CC) -o $@ $< $(LDADD)
-+	$(CC) $(LDFLAGS) -o $@ $< $(LDADD)
- 
- .PHONY: clean
- clean:
-diff --git a/plugins/syslog/Makefile b/plugins/syslog/Makefile
-index 62d916a..71f5f92 100644
---- a/plugins/syslog/Makefile
-+++ b/plugins/syslog/Makefile
-@@ -1,3 +1,11 @@
-+CC      ?= $(CROSS_COMPILE)gcc
-+LD      ?= $(CROSS_COMPILE)ld
-+AR      ?= $(CROSS_COMPILE)ar
-+NM      ?= $(CROSS_COMPILE)nm
-+OBJCOPY ?= $(CROSS_COMPILE)objcopy
-+OBJDUMP ?= $(CROSS_COMPILE)objdump
-+READELF ?= $(CROSS_COMPILE)readelf
-+
- PLUGIN_UUID = 96bcf744-4f72-4866-bf1d-8634fd9c65e5
- 
- PLUGIN			= $(PLUGIN_UUID).plugin
-@@ -6,17 +14,17 @@ PLUGIN_OBJ		= $(patsubst %.c, %.o, $(PLUGIN_SRS))
- PLUGIN_INCLUDES_DIR	= $(CURDIR) $(TEEC_EXPORT)/include
- 
- PLUGIN_INCLUDES		= $(addprefix -I, $(PLUGIN_INCLUDES_DIR))
--PLUGIN_CCFLAGS		= -Wall -fPIC
--PLUGIN_LDFLAGS		= -shared
-+PLUGIN_CCFLAGS		= $(CFLAGS) -Wall -fPIC
-+PLUGIN_LDFLAGS		= $(LDFLAGS) -shared
- 
- .PHONY: all
- all: $(PLUGIN)
- 
- $(PLUGIN): $(PLUGIN_OBJ)
--	$(CROSS_COMPILE)gcc $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-+	$(CC) $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
- 
- %.o: %.c
--	$(CROSS_COMPILE)gcc $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
-+	$(CC) $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
- 
- .PHONY: clean
- clean:
--- 
-2.25.1
-
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -37
deleted file mode 100644
index 80e6b5f..0000000
@@ -1,37 +0,0 @@
-From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17 00:00:00 2001
-From: Sumit Garg <[email protected]>
-Date: Tue, 20 Jul 2021 14:20:10 +0530
-Subject: [PATCH] Makefile: Enable plugins installation in rootfs
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg <[email protected]>
-
----
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index a275842..9359d95 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,14 +25,19 @@ prepare-for-rootfs: examples
- 	@mkdir -p $(OUTPUT_DIR)
- 	@mkdir -p $(OUTPUT_DIR)/ta
- 	@mkdir -p $(OUTPUT_DIR)/ca
-+	@mkdir -p $(OUTPUT_DIR)/plugins
- 	@for example in $(EXAMPLE_LIST); do \
- 		if [ -e $$example/host/optee_example_$$example ]; then \
- 			cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
- 		fi; \
- 		cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
-+		if [ $$example = plugins ]; then \
-+			cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
-+		fi; \
- 	done
- 
- prepare-for-rootfs-clean:
- 	@rm -rf $(OUTPUT_DIR)/ta
- 	@rm -rf $(OUTPUT_DIR)/ca
-+	@rm -rf $(OUTPUT_DIR)/plugins
- 	@rmdir --ignore-fail-on-non-empty $(OUTPUT_DIR) || test ! -e $(OUTPUT_DIR)
meta-arm/recipes-security/optee/optee-examples_3.14.0.bb deleted +0 -4
deleted file mode 100644
index f2b5f7d..0000000
@@ -1,4 +0,0 @@
-require optee-examples.inc
-
-SRCREV = "e9c870525af8f7e7fccf575a0ca5394ce55adcec"
-
meta-arm/recipes-security/optee/optee-examples_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..b5f6269
@@ -0,0 +1,3 @@
+require optee-examples.inc
+
+SRCREV = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +2 -1
similarity index 94%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb
index 0d37a52..c710e27 100644
@@ -1,10 +1,11 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
-require optee-os_3.14.0.bb
+require optee-os_3.16.0.bb
 
 SUMMARY = "OP-TEE Trusted OS TA devkit"
 DESCRIPTION = "OP-TEE TA devkit for build TAs"
 HOMEPAGE = "https://www.op-tee.org/"
 
+
 do_install() {
     #install TA devkit
     install -d ${D}${includedir}/optee/export-user_ta/
meta-arm/recipes-security/optee/optee-os.inc +1 -1
index 1506a58..57c64fd 100644
@@ -10,7 +10,7 @@ require optee.inc
 
 CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 
-DEPENDS = "python3-pycryptodome-native python3-pyelftools-native"
+DEPENDS = "python3-pycryptodome-native python3-pyelftools-native python3-cryptography-native"
 
 DEPENDS:append:toolchain-clang = " compiler-rt"
 
meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +1 -1
similarity index 76%
rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb
index 95d82bb..873e964 100644
@@ -1,6 +1,6 @@
 require optee-os.inc
 
-SRCREV = "d21befa5e53eae9db469eba1685f5aa5c6f92c2f"
+SRCREV = "d0b742d1564834dac903f906168d7357063d5459"
 
 SRC_URI:append = " \
     file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
meta-arm/recipes-security/optee/optee-test.inc +1 -1
index aada243..33eda29 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 inherit python3native ptest
 require optee.inc
 
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
 
 SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
            file://run-ptest \
meta-arm/recipes-security/optee/optee-test_3.14.0.bb deleted +0 -3
deleted file mode 100644
index 6367c27..0000000
@@ -1,3 +0,0 @@
-require optee-test.inc
-
-SRCREV = "f2eb88affbb7f028561b4fd5cbd049d5d704f741"
meta-arm/recipes-security/optee/optee-test_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..03f9c34
@@ -0,0 +1,3 @@
+require optee-test.inc
+
+SRCREV = "1cf0e6d2bdd1145370033d4e182634458528579d"
meta-arm/recipes-security/optee/optee.inc +3 -0
index f02a022..beae366 100644
@@ -26,3 +26,6 @@ EXTRA_OEMAKE += "V=1 \
                  OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                  TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
                 "
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
Signature · 1 line
2.25.1
#2 lore raw

Hi John,

Quoted 16 lines · Jon Mason
Quoted 6 lines · Alejandro Enedino Hernandez Samaniego

- Removes upstreamed patches for optee-examples
- Fixes optee-examples installation
- Includes new python3-cryptography dependency
- Fixes python3-cryptography to work with openssl

Tested on qemuarm64-secureboot via optee-examples xtest -l 15

With the new changes in python3-crypto, this is no longer working. I'm seeing the following error in CI.

--- Error summary ---
ERROR: Nothing PROVIDES 'python3-cryptography-native' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee/optee-os_3.16.0.bb DEPENDS on or otherwise requires it). Close matches:
python3-cython-native
python3-pycryptodome-native
python3-typogrify-native

Quoted 5 lines

I _think_ that adding meta-openembedded.yml being adding to the machines should fix it, but I'm not sure that is the right solution.

Thanks,
Jon

My apologies, I was testing with meta-oe/meta-python enabled hence I didnt see the error before.

I'm not sure its the right solution either, this dependency is coming from the pem_to_pub_c.py script which is now using python3-cyrptography since commit https://github.com/OP-TEE/optee_os/commit/169eac19852d98d8ade821f913bbdd76faf52823 (this also means we could remove python3-cryptodome from the dependencies as well), as far as I can tell this creates a hard dependency, passing EXTRA_OEMAKE += " CFG_WITH_USER_TA=n" would avoid executing the script completely but I also dont think thats what we want.

Should we include meta-openembedded.yml?,  or what other choice do we have? create a python3-cyrptography recipe to meta-arm?, thoughts?

Cheers,

Alejandro

Quoted 437 lines
Quoted 437 lines
---
  ....bbappend => optee-client_3.16.0.bbappend} |  0
  ...pend => optee-os-tadevkit_3.16.0.bbappend} |  0
  ...14.0.bbappend => optee-os_3.16.0.bbappend} |  0
  ....0.bbappend => optee-test_3.16.0.bbappend} |  0
  .../optee-ftpm/optee-ftpm_git.bb              |  8 +-
  .../optee/optee-client_3.14.0.bb              |  3 -
  .../optee/optee-client_3.16.0.bb              |  3 +
  .../recipes-security/optee/optee-examples.inc |  7 +-
  ...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++
  ...efault-cross-compiler-environment-se.patch | 84 -------------------
  ...nable-plugins-installation-in-rootfs.patch | 37 --------
  .../optee/optee-examples_3.14.0.bb            |  4 -
  .../optee/optee-examples_3.16.0.bb            |  3 +
  ..._3.14.0.bb => optee-os-tadevkit_3.16.0.bb} |  3 +-
  meta-arm/recipes-security/optee/optee-os.inc  |  2 +-
  ...{optee-os_3.14.0.bb => optee-os_3.16.0.bb} |  2 +-
  .../recipes-security/optee/optee-test.inc     |  2 +-
  .../optee/optee-test_3.14.0.bb                |  3 -
  .../optee/optee-test_3.16.0.bb                |  3 +
  meta-arm/recipes-security/optee/optee.inc     |  3 +
  20 files changed, 73 insertions(+), 140 deletions(-)

rename meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bbappend => optee-client_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14.0.bbappend => optee-os-tadevkit_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappend => optee-os_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbappend => optee-test_3.16.0.bbappend} (100%) delete mode 100644 meta-arm/recipes-security/optee/optee-client_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-client_3.16.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-examples_3.16.0.bb
rename meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.bb => optee-os-tadevkit_3.16.0.bb} (94%) rename meta-arm/recipes-security/optee/{optee-os_3.14.0.bb => optee-os_3.16.0.bb} (76%)
delete mode 100644 meta-arm/recipes-security/optee/optee-test_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-test_3.16.0.bb

meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +7 -1
index f2a74da..0eb64cd 100644
@@ -15,7 +15,9 @@ inherit deploy python3native
  LICENSE = "MIT"
  LIC_FILES_CHKSUM ="file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5"
 
-DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit"
+DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit \
+    python3-cryptography-native \
+    "
 
  FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
 
@@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall = "\
      CFG_ARM64_ta_arm64=y \
  "
 
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
+
  PARALLEL_MAKE = ""
 
  do_compile() {
meta-arm/recipes-security/optee/optee-client_3.14.0.bb deleted +0 -3
deleted file mode 100644
index be78b88..0000000
@@ -1,3 +0,0 @@
-require optee-client.inc
-
-SRCREV = "06e1b32f6a7028e039c625b07cfc25fda0c17d53"
meta-arm/recipes-security/optee/optee-client_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..4a36cbc
@@ -0,0 +1,3 @@
+require optee-client.inc
+
+SRCREV = "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"
meta-arm/recipes-security/optee/optee-examples.inc +3 -4
index 656722e..097f892 100644
@@ -5,16 +5,14 @@ HOMEPAGE ="https://github.com/linaro-swg/optee_examples"
  LICENSE = "BSD-2-Clause"
  LIC_FILES_CHKSUM ="file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
 
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
 
  inherit python3native
 
  require optee.inc
 
  SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https \
-file://0001-plugins-Honour-default-cross-compiler-environment-se.patch  \
-file://0002-Makefile-Enable-plugins-installation-in-rootfs.patch  \
-          "
+file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch"
 
  EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
                   HOST_CROSS_COMPILE=${HOST_PREFIX} \
@@ -25,6 +23,7 @@ EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
  S = "${WORKDIR}/git"
  B = "${WORKDIR}/build"
 
+
  do_compile() {
      oe_runmake -C ${S}
  }
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +46 -0
new file mode 100644
index 0000000..70add62
@@ -0,0 +1,46 @@
+From 11610debf750f15c7a104db7315dcd7d69e282a8 Mon Sep 17 00:00:00 2001
+From: Alejandro Enedino Hernandez Samaniego<[email protected]>
+Date: Sat, 26 Feb 2022 01:52:26 +0000
+Subject: [PATCH] Makefile: Fix non-portable sh check for plugins
+
+Upstream-Status: Pending
+
+We previously held a patch that used "=" for comparison, but when
+that patch got upstreamed it was changed to "==" which is non-portable,
+resulting in an error:
+
+/bin/sh: 6: [: acipher: unexpected operator
+/bin/sh: 6: [: plugins: unexpected operator
+/bin/sh: 6: [: hello_world: unexpected operator
+/bin/sh: 6: [: hotp: unexpected operator
+/bin/sh: 6: [: aes: unexpected operator
+/bin/sh: 6: [: random: unexpected operator
+/bin/sh: 6: [: secure_storage: unexpected operator
+
+if /bin/sh doesnt point to bash.
+
+Which in turn causes our do_install task to fail since plugins arent
+where we expect them to be.
+
+
+Signed-off-by: Alejandro Enedino Hernandez Samaniego<[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b3f16aa..9359d95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ prepare-for-rootfs: examples
+ 			cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
+ 		fi; \
+ 		cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
+-		if [ $$example == plugins ]; then \
++		if [ $$example = plugins ]; then \
+ 			cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
+ 		fi; \
+ 	done
+--
+2.25.1
+
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -84
deleted file mode 100644
index 033e48c..0000000
@@ -1,84 +0,0 @@
-From 79c826c249001700007a6dffe80c3d61ff4428ef Mon Sep 17 00:00:00 2001
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 13:54:30 +0530
-Subject: [PATCH 1/2] plugins: Honour default cross compiler environment setup
-
-Honour default $(CC), $(CFLAGS) and $(LDFLAGS) variables. Without this
-plugins example fails to build for OE/Yocto.
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg<[email protected]>
----
- plugins/Makefile        |  2 +-
- plugins/host/Makefile   |  2 +-
- plugins/syslog/Makefile | 16 ++++++++++++----
- 3 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/Makefile b/plugins/Makefile
-index 2372b38..ea472b4 100644
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -8,7 +8,7 @@ TA_CROSS_COMPILE ?= $(CROSS_COMPILE)
- all:
- 	$(MAKE) -C host CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables
- 	$(MAKE) -C ta CROSS_COMPILE="$(TA_CROSS_COMPILE)" LDFLAGS=""
--	$(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)"
-+	$(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables
-
- .PHONY: clean
- clean:
-diff --git a/plugins/host/Makefile b/plugins/host/Makefile
-index 7285104..76244c7 100644
---- a/plugins/host/Makefile
-+++ b/plugins/host/Makefile
-@@ -20,7 +20,7 @@ BINARY = optee_example_plugins
- all: $(BINARY)
-
- $(BINARY): $(OBJS)
--	$(CC) -o $@ $< $(LDADD)
-+	$(CC) $(LDFLAGS) -o $@ $< $(LDADD)
-
- .PHONY: clean
- clean:
-diff --git a/plugins/syslog/Makefile b/plugins/syslog/Makefile
-index 62d916a..71f5f92 100644
---- a/plugins/syslog/Makefile
-+++ b/plugins/syslog/Makefile
-@@ -1,3 +1,11 @@
-+CC      ?= $(CROSS_COMPILE)gcc
-+LD      ?= $(CROSS_COMPILE)ld
-+AR      ?= $(CROSS_COMPILE)ar
-+NM      ?= $(CROSS_COMPILE)nm
-+OBJCOPY ?= $(CROSS_COMPILE)objcopy
-+OBJDUMP ?= $(CROSS_COMPILE)objdump
-+READELF ?= $(CROSS_COMPILE)readelf
-+
- PLUGIN_UUID = 96bcf744-4f72-4866-bf1d-8634fd9c65e5
-
- PLUGIN			= $(PLUGIN_UUID).plugin
-@@ -6,17 +14,17 @@ PLUGIN_OBJ		= $(patsubst %.c, %.o, $(PLUGIN_SRS))
- PLUGIN_INCLUDES_DIR	= $(CURDIR) $(TEEC_EXPORT)/include
-
- PLUGIN_INCLUDES		= $(addprefix -I, $(PLUGIN_INCLUDES_DIR))
--PLUGIN_CCFLAGS		= -Wall -fPIC
--PLUGIN_LDFLAGS		= -shared
-+PLUGIN_CCFLAGS		= $(CFLAGS) -Wall -fPIC
-+PLUGIN_LDFLAGS		= $(LDFLAGS) -shared
-
- .PHONY: all
- all: $(PLUGIN)
-
- $(PLUGIN): $(PLUGIN_OBJ)
--	$(CROSS_COMPILE)gcc $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-+	$(CC) $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-
- %.o: %.c
--	$(CROSS_COMPILE)gcc $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
-+	$(CC) $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
-
- .PHONY: clean
- clean:
---
-2.25.1
-
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -37
deleted file mode 100644
index 80e6b5f..0000000
@@ -1,37 +0,0 @@
-From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17 00:00:00 2001
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 14:20:10 +0530
-Subject: [PATCH] Makefile: Enable plugins installation in rootfs
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg<[email protected]>
-
----
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index a275842..9359d95 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,14 +25,19 @@ prepare-for-rootfs: examples
- 	@mkdir -p $(OUTPUT_DIR)
- 	@mkdir -p $(OUTPUT_DIR)/ta
- 	@mkdir -p $(OUTPUT_DIR)/ca
-+	@mkdir -p $(OUTPUT_DIR)/plugins
- 	@for example in $(EXAMPLE_LIST); do \
- 		if [ -e $$example/host/optee_example_$$example ]; then \
- 			cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
- 		fi; \
- 		cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
-+		if [ $$example = plugins ]; then \
-+			cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
-+		fi; \
- 	done
-
- prepare-for-rootfs-clean:
- 	@rm -rf $(OUTPUT_DIR)/ta
- 	@rm -rf $(OUTPUT_DIR)/ca
-+	@rm -rf $(OUTPUT_DIR)/plugins
- 	@rmdir --ignore-fail-on-non-empty $(OUTPUT_DIR) || test ! -e $(OUTPUT_DIR)
meta-arm/recipes-security/optee/optee-examples_3.14.0.bb deleted +0 -4
deleted file mode 100644
index f2b5f7d..0000000
@@ -1,4 +0,0 @@
-require optee-examples.inc
-
-SRCREV = "e9c870525af8f7e7fccf575a0ca5394ce55adcec"
-
meta-arm/recipes-security/optee/optee-examples_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..b5f6269
@@ -0,0 +1,3 @@
+require optee-examples.inc
+
+SRCREV = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +2 -1
similarity index 94%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb
index 0d37a52..c710e27 100644
@@ -1,10 +1,11 @@
  FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
-require optee-os_3.14.0.bb
+require optee-os_3.16.0.bb
 
  SUMMARY = "OP-TEE Trusted OS TA devkit"
  DESCRIPTION = "OP-TEE TA devkit for build TAs"
  HOMEPAGE ="https://www.op-tee.org/"
 
+
  do_install() {
      #install TA devkit
      install -d ${D}${includedir}/optee/export-user_ta/
meta-arm/recipes-security/optee/optee-os.inc +1 -1
index 1506a58..57c64fd 100644
@@ -10,7 +10,7 @@ require optee.inc
 
  CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 
-DEPENDS = "python3-pycryptodome-native python3-pyelftools-native"
+DEPENDS = "python3-pycryptodome-native python3-pyelftools-native python3-cryptography-native"
 
  DEPENDS:append:toolchain-clang = " compiler-rt"
 
meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +1 -1
similarity index 76%
rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb
index 95d82bb..873e964 100644
@@ -1,6 +1,6 @@
  require optee-os.inc
 
-SRCREV = "d21befa5e53eae9db469eba1685f5aa5c6f92c2f"
+SRCREV = "d0b742d1564834dac903f906168d7357063d5459"
 
  SRC_URI:append = " \
      file://0006-allow-setting-sysroot-for-libgcc-lookup.patch  \
meta-arm/recipes-security/optee/optee-test.inc +1 -1
index aada243..33eda29 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM ="file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
  inherit python3native ptest
  require optee.inc
 
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
 
  SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
             file://run-ptest  \
meta-arm/recipes-security/optee/optee-test_3.14.0.bb deleted +0 -3
deleted file mode 100644
index 6367c27..0000000
@@ -1,3 +0,0 @@
-require optee-test.inc
-
-SRCREV = "f2eb88affbb7f028561b4fd5cbd049d5d704f741"
meta-arm/recipes-security/optee/optee-test_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..03f9c34
@@ -0,0 +1,3 @@
+require optee-test.inc
+
+SRCREV = "1cf0e6d2bdd1145370033d4e182634458528579d"
meta-arm/recipes-security/optee/optee.inc +3 -0
index f02a022..beae366 100644
@@ -26,3 +26,6 @@ EXTRA_OEMAKE += "V=1 \
                   OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                   TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
                  "
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
Signature · 11 lines
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3088):https://lists.yoctoproject.org/g/meta-arm/message/3088
Mute This Topic:https://lists.yoctoproject.org/mt/89404067/4354175
Group Owner:[email protected]
Unsubscribe:https://lists.yoctoproject.org/g/meta-arm/unsub  [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
#4 lore raw
In reply to a message not in the archive
Quoted 39 lines · Jon Mason
Quoted 37 lines · Alejandro Hernandez

Hi John,

Quoted 16 lines · Jon Mason
Quoted 6 lines · Alejandro Enedino Hernandez Samaniego

- Removes upstreamed patches for optee-examples
- Fixes optee-examples installation
- Includes new python3-cryptography dependency
- Fixes python3-cryptography to work with openssl

Tested on qemuarm64-secureboot via optee-examples xtest -l 15

With the new changes in python3-crypto, this is no longer working. I'm seeing the following error in CI.

--- Error summary ---
ERROR: Nothing PROVIDES 'python3-cryptography-native' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee/optee-os_3.16.0.bb DEPENDS on or otherwise requires it). Close matches:
python3-cython-native
python3-pycryptodome-native
python3-typogrify-native

Quoted 5 lines

I _think_ that adding meta-openembedded.yml being adding to the machines should fix it, but I'm not sure that is the right solution.

Thanks,
Jon

My apologies, I was testing with meta-oe/meta-python enabled hence I didnt see the error before.

I'm not sure its the right solution either, this dependency is coming from the pem_to_pub_c.py script which is now using python3-cyrptography since commit https://github.com/OP-TEE/optee_os/commit/169eac19852d98d8ade821f913bbdd76faf52823
(this also means we could remove python3-cryptodome from the dependencies as well), as far as I can tell this creates a hard dependency, passing EXTRA_OEMAKE += " CFG_WITH_USER_TA=n" would avoid executing the script completely but I also dont think thats what we want.

Quoted 2 lines
Quoted 2 lines

Should we include meta-openembedded.yml?, or what other choice do we have? create a python3-cyrptography recipe to meta-arm?, thoughts?

Yes, we should include meta-openembedded.yml as a dependency and remove python3-cryptodome from the dependencies.

-Sumit

Quoted 430 lines

OPTEE isn't an area I understand well (to know whether removing this is superior to adding the dependency in the files). So, I'm directly cc'ing contributors that I think will have an opinion to this response.

Thanks,
Jon

Quoted 421 lines

Cheers,

Alejandro

Quoted 416 lines
Quoted 416 lines
---
  ....bbappend => optee-client_3.16.0.bbappend} |  0
  ...pend => optee-os-tadevkit_3.16.0.bbappend} |  0
  ...14.0.bbappend => optee-os_3.16.0.bbappend} |  0
  ....0.bbappend => optee-test_3.16.0.bbappend} |  0
  .../optee-ftpm/optee-ftpm_git.bb              |  8 +-
  .../optee/optee-client_3.14.0.bb              |  3 -
  .../optee/optee-client_3.16.0.bb              |  3 +
  .../recipes-security/optee/optee-examples.inc |  7 +-
  ...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++
  ...efault-cross-compiler-environment-se.patch | 84 -------------------
  ...nable-plugins-installation-in-rootfs.patch | 37 --------
  .../optee/optee-examples_3.14.0.bb            |  4 -
  .../optee/optee-examples_3.16.0.bb            |  3 +
  ..._3.14.0.bb => optee-os-tadevkit_3.16.0.bb} |  3 +-
  meta-arm/recipes-security/optee/optee-os.inc  |  2 +-
  ...{optee-os_3.14.0.bb => optee-os_3.16.0.bb} |  2 +-
  .../recipes-security/optee/optee-test.inc     |  2 +-
  .../optee/optee-test_3.14.0.bb                |  3 -
  .../optee/optee-test_3.16.0.bb                |  3 +
  meta-arm/recipes-security/optee/optee.inc     |  3 +
  20 files changed, 73 insertions(+), 140 deletions(-)

rename meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bbappend => optee-client_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14.0.bbappend => optee-os-tadevkit_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappend => optee-os_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbappend => optee-test_3.16.0.bbappend} (100%) delete mode 100644 meta-arm/recipes-security/optee/optee-client_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-client_3.16.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-examples_3.16.0.bb
rename meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.bb => optee-os-tadevkit_3.16.0.bb} (94%) rename meta-arm/recipes-security/optee/{optee-os_3.14.0.bb => optee-os_3.16.0.bb} (76%)
delete mode 100644 meta-arm/recipes-security/optee/optee-test_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-test_3.16.0.bb

meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +7 -1
index f2a74da..0eb64cd 100644
@@ -15,7 +15,9 @@ inherit deploy python3native
  LICENSE = "MIT"
  LIC_FILES_CHKSUM ="file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5"
-DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit"
+DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit \
+    python3-cryptography-native \
+    "
  FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
@@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall = "\
      CFG_ARM64_ta_arm64=y \
  "
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
+
  PARALLEL_MAKE = ""
  do_compile() {
meta-arm/recipes-security/optee/optee-client_3.14.0.bb deleted +0 -3
deleted file mode 100644
index be78b88..0000000
@@ -1,3 +0,0 @@
-require optee-client.inc
-
-SRCREV = "06e1b32f6a7028e039c625b07cfc25fda0c17d53"
meta-arm/recipes-security/optee/optee-client_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..4a36cbc
@@ -0,0 +1,3 @@
+require optee-client.inc
+
+SRCREV = "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"
meta-arm/recipes-security/optee/optee-examples.inc +3 -4
index 656722e..097f892 100644
@@ -5,16 +5,14 @@ HOMEPAGE ="https://github.com/linaro-swg/optee_examples"
  LICENSE = "BSD-2-Clause"
  LIC_FILES_CHKSUM ="file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
  inherit python3native
  require optee.inc
  SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https \
-file://0001-plugins-Honour-default-cross-compiler-environment-se.patch  \
-file://0002-Makefile-Enable-plugins-installation-in-rootfs.patch  \
-          "
+file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch"
  EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
                   HOST_CROSS_COMPILE=${HOST_PREFIX} \
@@ -25,6 +23,7 @@ EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
  S = "${WORKDIR}/git"
  B = "${WORKDIR}/build"
+
  do_compile() {
      oe_runmake -C ${S}
  }
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +46 -0
new file mode 100644
index 0000000..70add62
@@ -0,0 +1,46 @@
+From 11610debf750f15c7a104db7315dcd7d69e282a8 Mon Sep 17 00:00:00 2001
+From: Alejandro Enedino Hernandez Samaniego<[email protected]>
+Date: Sat, 26 Feb 2022 01:52:26 +0000
+Subject: [PATCH] Makefile: Fix non-portable sh check for plugins
+
+Upstream-Status: Pending
+
+We previously held a patch that used "=" for comparison, but when
+that patch got upstreamed it was changed to "==" which is non-portable,
+resulting in an error:
+
+/bin/sh: 6: [: acipher: unexpected operator
+/bin/sh: 6: [: plugins: unexpected operator
+/bin/sh: 6: [: hello_world: unexpected operator
+/bin/sh: 6: [: hotp: unexpected operator
+/bin/sh: 6: [: aes: unexpected operator
+/bin/sh: 6: [: random: unexpected operator
+/bin/sh: 6: [: secure_storage: unexpected operator
+
+if /bin/sh doesnt point to bash.
+
+Which in turn causes our do_install task to fail since plugins arent
+where we expect them to be.
+
+
+Signed-off-by: Alejandro Enedino Hernandez Samaniego<[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b3f16aa..9359d95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ prepare-for-rootfs: examples
+                         cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
+                 fi; \
+                 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
+-                if [ $$example == plugins ]; then \
++                if [ $$example = plugins ]; then \
+                         cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
+                 fi; \
+         done
+--
+2.25.1
+
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -84
deleted file mode 100644
index 033e48c..0000000
@@ -1,84 +0,0 @@
-From 79c826c249001700007a6dffe80c3d61ff4428ef Mon Sep 17 00:00:00 2001
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 13:54:30 +0530
-Subject: [PATCH 1/2] plugins: Honour default cross compiler environment setup
-
-Honour default $(CC), $(CFLAGS) and $(LDFLAGS) variables. Without this
-plugins example fails to build for OE/Yocto.
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg<[email protected]>
----
- plugins/Makefile        |  2 +-
- plugins/host/Makefile   |  2 +-
- plugins/syslog/Makefile | 16 ++++++++++++----
- 3 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/Makefile b/plugins/Makefile
-index 2372b38..ea472b4 100644
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -8,7 +8,7 @@ TA_CROSS_COMPILE ?= $(CROSS_COMPILE)
- all:
-         $(MAKE) -C host CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables
-         $(MAKE) -C ta CROSS_COMPILE="$(TA_CROSS_COMPILE)" LDFLAGS=""
--        $(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)"
-+        $(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables
-
- .PHONY: clean
- clean:
-diff --git a/plugins/host/Makefile b/plugins/host/Makefile
-index 7285104..76244c7 100644
---- a/plugins/host/Makefile
-+++ b/plugins/host/Makefile
-@@ -20,7 +20,7 @@ BINARY = optee_example_plugins
- all: $(BINARY)
-
- $(BINARY): $(OBJS)
--        $(CC) -o $@ $< $(LDADD)
-+        $(CC) $(LDFLAGS) -o $@ $< $(LDADD)
-
- .PHONY: clean
- clean:
-diff --git a/plugins/syslog/Makefile b/plugins/syslog/Makefile
-index 62d916a..71f5f92 100644
---- a/plugins/syslog/Makefile
-+++ b/plugins/syslog/Makefile
-@@ -1,3 +1,11 @@
-+CC      ?= $(CROSS_COMPILE)gcc
-+LD      ?= $(CROSS_COMPILE)ld
-+AR      ?= $(CROSS_COMPILE)ar
-+NM      ?= $(CROSS_COMPILE)nm
-+OBJCOPY ?= $(CROSS_COMPILE)objcopy
-+OBJDUMP ?= $(CROSS_COMPILE)objdump
-+READELF ?= $(CROSS_COMPILE)readelf
-+
- PLUGIN_UUID = 96bcf744-4f72-4866-bf1d-8634fd9c65e5
-
- PLUGIN                  = $(PLUGIN_UUID).plugin
-@@ -6,17 +14,17 @@ PLUGIN_OBJ            = $(patsubst %.c, %.o, $(PLUGIN_SRS))
- PLUGIN_INCLUDES_DIR     = $(CURDIR) $(TEEC_EXPORT)/include
-
- PLUGIN_INCLUDES         = $(addprefix -I, $(PLUGIN_INCLUDES_DIR))
--PLUGIN_CCFLAGS          = -Wall -fPIC
--PLUGIN_LDFLAGS          = -shared
-+PLUGIN_CCFLAGS          = $(CFLAGS) -Wall -fPIC
-+PLUGIN_LDFLAGS          = $(LDFLAGS) -shared
-
- .PHONY: all
- all: $(PLUGIN)
-
- $(PLUGIN): $(PLUGIN_OBJ)
--        $(CROSS_COMPILE)gcc $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-+        $(CC) $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-
- %.o: %.c
--        $(CROSS_COMPILE)gcc $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
-+        $(CC) $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
-
- .PHONY: clean
- clean:
---
-2.25.1
-
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -37
deleted file mode 100644
index 80e6b5f..0000000
@@ -1,37 +0,0 @@
-From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17 00:00:00 2001
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 14:20:10 +0530
-Subject: [PATCH] Makefile: Enable plugins installation in rootfs
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg<[email protected]>
-
----
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index a275842..9359d95 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,14 +25,19 @@ prepare-for-rootfs: examples
-         @mkdir -p $(OUTPUT_DIR)
-         @mkdir -p $(OUTPUT_DIR)/ta
-         @mkdir -p $(OUTPUT_DIR)/ca
-+        @mkdir -p $(OUTPUT_DIR)/plugins
-         @for example in $(EXAMPLE_LIST); do \
-                 if [ -e $$example/host/optee_example_$$example ]; then \
-                         cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
-                 fi; \
-                 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
-+                if [ $$example = plugins ]; then \
-+                        cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
-+                fi; \
-         done
-
- prepare-for-rootfs-clean:
-         @rm -rf $(OUTPUT_DIR)/ta
-         @rm -rf $(OUTPUT_DIR)/ca
-+        @rm -rf $(OUTPUT_DIR)/plugins
-         @rmdir --ignore-fail-on-non-empty $(OUTPUT_DIR) || test ! -e $(OUTPUT_DIR)
meta-arm/recipes-security/optee/optee-examples_3.14.0.bb deleted +0 -4
deleted file mode 100644
index f2b5f7d..0000000
@@ -1,4 +0,0 @@
-require optee-examples.inc
-
-SRCREV = "e9c870525af8f7e7fccf575a0ca5394ce55adcec"
-
meta-arm/recipes-security/optee/optee-examples_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..b5f6269
@@ -0,0 +1,3 @@
+require optee-examples.inc
+
+SRCREV = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +2 -1
similarity index 94%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb
index 0d37a52..c710e27 100644
@@ -1,10 +1,11 @@
  FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
-require optee-os_3.14.0.bb
+require optee-os_3.16.0.bb
  SUMMARY = "OP-TEE Trusted OS TA devkit"
  DESCRIPTION = "OP-TEE TA devkit for build TAs"
  HOMEPAGE ="https://www.op-tee.org/"
+
  do_install() {
      #install TA devkit
      install -d ${D}${includedir}/optee/export-user_ta/
meta-arm/recipes-security/optee/optee-os.inc +1 -1
index 1506a58..57c64fd 100644
@@ -10,7 +10,7 @@ require optee.inc
  CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
-DEPENDS = "python3-pycryptodome-native python3-pyelftools-native"
+DEPENDS = "python3-pycryptodome-native python3-pyelftools-native python3-cryptography-native"
  DEPENDS:append:toolchain-clang = " compiler-rt"
meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +1 -1
similarity index 76%
rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb
index 95d82bb..873e964 100644
@@ -1,6 +1,6 @@
  require optee-os.inc
-SRCREV = "d21befa5e53eae9db469eba1685f5aa5c6f92c2f"
+SRCREV = "d0b742d1564834dac903f906168d7357063d5459"
  SRC_URI:append = " \
      file://0006-allow-setting-sysroot-for-libgcc-lookup.patch  \
meta-arm/recipes-security/optee/optee-test.inc +1 -1
index aada243..33eda29 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM ="file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
  inherit python3native ptest
  require optee.inc
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
  SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
             file://run-ptest  \
meta-arm/recipes-security/optee/optee-test_3.14.0.bb deleted +0 -3
deleted file mode 100644
index 6367c27..0000000
@@ -1,3 +0,0 @@
-require optee-test.inc
-
-SRCREV = "f2eb88affbb7f028561b4fd5cbd049d5d704f741"
meta-arm/recipes-security/optee/optee-test_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..03f9c34
@@ -0,0 +1,3 @@
+require optee-test.inc
+
+SRCREV = "1cf0e6d2bdd1145370033d4e182634458528579d"
meta-arm/recipes-security/optee/optee.inc +3 -1
index f02a022..beae366 100644
@@ -26,3 +26,6 @@ EXTRA_OEMAKE += "V=1 \
                   OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                   TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
                  "
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3088):https://lists.yoctoproject.org/g/meta-arm/message/3088 Mute This Topic:https://lists.yoctoproject.org/mt/89404067/4354175
Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

In ci/qemuarm64-secureboot.yml add:

ci/meta-openembedded.yml

Kind regards
________________________________
From: Sumit Garg <[email protected]>
Sent: 03 March 2022 05:31
To: Jon Mason <[email protected]>; Alejandro Hernandez <[email protected]>
Cc: [email protected] <[email protected]>; Vishnu Banavath <[email protected]>; Maxim Uvarov <[email protected]>; Peter Griffin <[email protected]>; Denys Dmytriyenko <[email protected]>; Drew Reed <[email protected]>; Abdellatif El Khlifi <[email protected]>
Subject: Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16

Quoted 39 lines · Jon Mason
Quoted 37 lines · Alejandro Hernandez

Hi John,

Quoted 16 lines · Jon Mason
Quoted 6 lines · Alejandro Enedino Hernandez Samaniego

- Removes upstreamed patches for optee-examples
- Fixes optee-examples installation
- Includes new python3-cryptography dependency
- Fixes python3-cryptography to work with openssl

Tested on qemuarm64-secureboot via optee-examples xtest -l 15

With the new changes in python3-crypto, this is no longer working. I'm seeing the following error in CI.

--- Error summary ---
ERROR: Nothing PROVIDES 'python3-cryptography-native' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee/optee-os_3.16.0.bb DEPENDS on or otherwise requires it). Close matches:
python3-cython-native
python3-pycryptodome-native
python3-typogrify-native

Quoted 5 lines

I _think_ that adding meta-openembedded.yml being adding to the machines should fix it, but I'm not sure that is the right solution.

Thanks,
Jon

My apologies, I was testing with meta-oe/meta-python enabled hence I didnt see the error before.

I'm not sure its the right solution either, this dependency is coming from the pem_to_pub_c.py script which is now using python3-cyrptography since commit https://github.com/OP-TEE/optee_os/commit/169eac19852d98d8ade821f913bbdd76faf52823
(this also means we could remove python3-cryptodome from the dependencies as well), as far as I can tell this creates a hard dependency, passing EXTRA_OEMAKE += " CFG_WITH_USER_TA=n" would avoid executing the script completely but I also dont think thats what we want.

Quoted 2 lines
Quoted 2 lines

Should we include meta-openembedded.yml?, or what other choice do we have? create a python3-cyrptography recipe to meta-arm?, thoughts?

Yes, we should include meta-openembedded.yml as a dependency and remove python3-cryptodome from the dependencies.

-Sumit

Quoted 430 lines

OPTEE isn't an area I understand well (to know whether removing this is superior to adding the dependency in the files). So, I'm directly cc'ing contributors that I think will have an opinion to this response.

Thanks,
Jon

Quoted 421 lines

Cheers,

Alejandro

Quoted 416 lines
Quoted 416 lines
---
  ....bbappend => optee-client_3.16.0.bbappend} |  0
  ...pend => optee-os-tadevkit_3.16.0.bbappend} |  0
  ...14.0.bbappend => optee-os_3.16.0.bbappend} |  0
  ....0.bbappend => optee-test_3.16.0.bbappend} |  0
  .../optee-ftpm/optee-ftpm_git.bb              |  8 +-
  .../optee/optee-client_3.14.0.bb              |  3 -
  .../optee/optee-client_3.16.0.bb              |  3 +
  .../recipes-security/optee/optee-examples.inc |  7 +-
  ...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++
  ...efault-cross-compiler-environment-se.patch | 84 -------------------
  ...nable-plugins-installation-in-rootfs.patch | 37 --------
  .../optee/optee-examples_3.14.0.bb            |  4 -
  .../optee/optee-examples_3.16.0.bb            |  3 +
  ..._3.14.0.bb => optee-os-tadevkit_3.16.0.bb} |  3 +-
  meta-arm/recipes-security/optee/optee-os.inc  |  2 +-
  ...{optee-os_3.14.0.bb => optee-os_3.16.0.bb} |  2 +-
  .../recipes-security/optee/optee-test.inc     |  2 +-
  .../optee/optee-test_3.14.0.bb                |  3 -
  .../optee/optee-test_3.16.0.bb                |  3 +
  meta-arm/recipes-security/optee/optee.inc     |  3 +
  20 files changed, 73 insertions(+), 140 deletions(-)

rename meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bbappend => optee-client_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14.0.bbappend => optee-os-tadevkit_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappend => optee-os_3.16.0.bbappend} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbappend => optee-test_3.16.0.bbappend} (100%) delete mode 100644 meta-arm/recipes-security/optee/optee-client_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-client_3.16.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-examples_3.16.0.bb
rename meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.bb => optee-os-tadevkit_3.16.0.bb} (94%) rename meta-arm/recipes-security/optee/{optee-os_3.14.0.bb => optee-os_3.16.0.bb} (76%)
delete mode 100644 meta-arm/recipes-security/optee/optee-test_3.14.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-test_3.16.0.bb

meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +7 -1
index f2a74da..0eb64cd 100644
@@ -15,7 +15,9 @@ inherit deploy python3native
  LICENSE = "MIT"
  LIC_FILES_CHKSUM ="file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5"
-DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit"
+DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit \
+    python3-cryptography-native \
+    "
  FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
@@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall = "\
      CFG_ARM64_ta_arm64=y \
  "
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
+
  PARALLEL_MAKE = ""
  do_compile() {
meta-arm/recipes-security/optee/optee-client_3.14.0.bb deleted +0 -3
deleted file mode 100644
index be78b88..0000000
@@ -1,3 +0,0 @@
-require optee-client.inc
-
-SRCREV = "06e1b32f6a7028e039c625b07cfc25fda0c17d53"
meta-arm/recipes-security/optee/optee-client_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..4a36cbc
@@ -0,0 +1,3 @@
+require optee-client.inc
+
+SRCREV = "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"
meta-arm/recipes-security/optee/optee-examples.inc +3 -4
index 656722e..097f892 100644
@@ -5,16 +5,14 @@ HOMEPAGE ="https://github.com/linaro-swg/optee_examples"
  LICENSE = "BSD-2-Clause"
  LIC_FILES_CHKSUM ="file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
  inherit python3native
  require optee.inc
  SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https \
-file://0001-plugins-Honour-default-cross-compiler-environment-se.patch  \
-file://0002-Makefile-Enable-plugins-installation-in-rootfs.patch  \
-          "
+file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch"
  EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
                   HOST_CROSS_COMPILE=${HOST_PREFIX} \
@@ -25,6 +23,7 @@ EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
  S = "${WORKDIR}/git"
  B = "${WORKDIR}/build"
+
  do_compile() {
      oe_runmake -C ${S}
  }
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +46 -0
new file mode 100644
index 0000000..70add62
@@ -0,0 +1,46 @@
+From 11610debf750f15c7a104db7315dcd7d69e282a8 Mon Sep 17 00:00:00 2001
+From: Alejandro Enedino Hernandez Samaniego<[email protected]>
+Date: Sat, 26 Feb 2022 01:52:26 +0000
+Subject: [PATCH] Makefile: Fix non-portable sh check for plugins
+
+Upstream-Status: Pending
+
+We previously held a patch that used "=" for comparison, but when
+that patch got upstreamed it was changed to "==" which is non-portable,
+resulting in an error:
+
+/bin/sh: 6: [: acipher: unexpected operator
+/bin/sh: 6: [: plugins: unexpected operator
+/bin/sh: 6: [: hello_world: unexpected operator
+/bin/sh: 6: [: hotp: unexpected operator
+/bin/sh: 6: [: aes: unexpected operator
+/bin/sh: 6: [: random: unexpected operator
+/bin/sh: 6: [: secure_storage: unexpected operator
+
+if /bin/sh doesnt point to bash.
+
+Which in turn causes our do_install task to fail since plugins arent
+where we expect them to be.
+
+
+Signed-off-by: Alejandro Enedino Hernandez Samaniego<[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b3f16aa..9359d95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ prepare-for-rootfs: examples
+                         cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
+                 fi; \
+                 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
+-                if [ $$example == plugins ]; then \
++                if [ $$example = plugins ]; then \
+                         cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
+                 fi; \
+         done
+--
+2.25.1
+
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -84
deleted file mode 100644
index 033e48c..0000000
@@ -1,84 +0,0 @@
-From 79c826c249001700007a6dffe80c3d61ff4428ef Mon Sep 17 00:00:00 2001
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 13:54:30 +0530
-Subject: [PATCH 1/2] plugins: Honour default cross compiler environment setup
-
-Honour default $(CC), $(CFLAGS) and $(LDFLAGS) variables. Without this
-plugins example fails to build for OE/Yocto.
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg<[email protected]>
----
- plugins/Makefile        |  2 +-
- plugins/host/Makefile   |  2 +-
- plugins/syslog/Makefile | 16 ++++++++++++----
- 3 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/Makefile b/plugins/Makefile
-index 2372b38..ea472b4 100644
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -8,7 +8,7 @@ TA_CROSS_COMPILE ?= $(CROSS_COMPILE)
- all:
-         $(MAKE) -C host CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables
-         $(MAKE) -C ta CROSS_COMPILE="$(TA_CROSS_COMPILE)" LDFLAGS=""
--        $(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)"
-+        $(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables
-
- .PHONY: clean
- clean:
-diff --git a/plugins/host/Makefile b/plugins/host/Makefile
-index 7285104..76244c7 100644
---- a/plugins/host/Makefile
-+++ b/plugins/host/Makefile
-@@ -20,7 +20,7 @@ BINARY = optee_example_plugins
- all: $(BINARY)
-
- $(BINARY): $(OBJS)
--        $(CC) -o $@ $< $(LDADD)
-+        $(CC) $(LDFLAGS) -o $@ $< $(LDADD)
-
- .PHONY: clean
- clean:
-diff --git a/plugins/syslog/Makefile b/plugins/syslog/Makefile
-index 62d916a..71f5f92 100644
---- a/plugins/syslog/Makefile
-+++ b/plugins/syslog/Makefile
-@@ -1,3 +1,11 @@
-+CC      ?= $(CROSS_COMPILE)gcc
-+LD      ?= $(CROSS_COMPILE)ld
-+AR      ?= $(CROSS_COMPILE)ar
-+NM      ?= $(CROSS_COMPILE)nm
-+OBJCOPY ?= $(CROSS_COMPILE)objcopy
-+OBJDUMP ?= $(CROSS_COMPILE)objdump
-+READELF ?= $(CROSS_COMPILE)readelf
-+
- PLUGIN_UUID = 96bcf744-4f72-4866-bf1d-8634fd9c65e5
-
- PLUGIN                  = $(PLUGIN_UUID).plugin
-@@ -6,17 +14,17 @@ PLUGIN_OBJ            = $(patsubst %.c, %.o, $(PLUGIN_SRS))
- PLUGIN_INCLUDES_DIR     = $(CURDIR) $(TEEC_EXPORT)/include
-
- PLUGIN_INCLUDES         = $(addprefix -I, $(PLUGIN_INCLUDES_DIR))
--PLUGIN_CCFLAGS          = -Wall -fPIC
--PLUGIN_LDFLAGS          = -shared
-+PLUGIN_CCFLAGS          = $(CFLAGS) -Wall -fPIC
-+PLUGIN_LDFLAGS          = $(LDFLAGS) -shared
-
- .PHONY: all
- all: $(PLUGIN)
-
- $(PLUGIN): $(PLUGIN_OBJ)
--        $(CROSS_COMPILE)gcc $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-+        $(CC) $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-
- %.o: %.c
--        $(CROSS_COMPILE)gcc $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
-+        $(CC) $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
-
- .PHONY: clean
- clean:
---
-2.25.1
-
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -37
deleted file mode 100644
index 80e6b5f..0000000
@@ -1,37 +0,0 @@
-From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17 00:00:00 2001
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 14:20:10 +0530
-Subject: [PATCH] Makefile: Enable plugins installation in rootfs
-
-Upstream-Status: Submitted [https://github.com/linaro-swg/optee_examples/pull/87]
-
-Signed-off-by: Sumit Garg<[email protected]>
-
----
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index a275842..9359d95 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,14 +25,19 @@ prepare-for-rootfs: examples
-         @mkdir -p $(OUTPUT_DIR)
-         @mkdir -p $(OUTPUT_DIR)/ta
-         @mkdir -p $(OUTPUT_DIR)/ca
-+        @mkdir -p $(OUTPUT_DIR)/plugins
-         @for example in $(EXAMPLE_LIST); do \
-                 if [ -e $$example/host/optee_example_$$example ]; then \
-                         cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
-                 fi; \
-                 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
-+                if [ $$example = plugins ]; then \
-+                        cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
-+                fi; \
-         done
-
- prepare-for-rootfs-clean:
-         @rm -rf $(OUTPUT_DIR)/ta
-         @rm -rf $(OUTPUT_DIR)/ca
-+        @rm -rf $(OUTPUT_DIR)/plugins
-         @rmdir --ignore-fail-on-non-empty $(OUTPUT_DIR) || test ! -e $(OUTPUT_DIR)
meta-arm/recipes-security/optee/optee-examples_3.14.0.bb deleted +0 -4
deleted file mode 100644
index f2b5f7d..0000000
@@ -1,4 +0,0 @@
-require optee-examples.inc
-
-SRCREV = "e9c870525af8f7e7fccf575a0ca5394ce55adcec"
-
meta-arm/recipes-security/optee/optee-examples_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..b5f6269
@@ -0,0 +1,3 @@
+require optee-examples.inc
+
+SRCREV = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +2 -1
similarity index 94%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb
index 0d37a52..c710e27 100644
@@ -1,10 +1,11 @@
  FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
-require optee-os_3.14.0.bb
+require optee-os_3.16.0.bb
  SUMMARY = "OP-TEE Trusted OS TA devkit"
  DESCRIPTION = "OP-TEE TA devkit for build TAs"
  HOMEPAGE ="https://www.op-tee.org/"
+
  do_install() {
      #install TA devkit
      install -d ${D}${includedir}/optee/export-user_ta/
meta-arm/recipes-security/optee/optee-os.inc +1 -1
index 1506a58..57c64fd 100644
@@ -10,7 +10,7 @@ require optee.inc
  CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
-DEPENDS = "python3-pycryptodome-native python3-pyelftools-native"
+DEPENDS = "python3-pycryptodome-native python3-pyelftools-native python3-cryptography-native"
  DEPENDS:append:toolchain-clang = " compiler-rt"
meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +1 -1
similarity index 76%
rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb
rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb
index 95d82bb..873e964 100644
@@ -1,6 +1,6 @@
  require optee-os.inc
-SRCREV = "d21befa5e53eae9db469eba1685f5aa5c6f92c2f"
+SRCREV = "d0b742d1564834dac903f906168d7357063d5459"
  SRC_URI:append = " \
      file://0006-allow-setting-sysroot-for-libgcc-lookup.patch  \
meta-arm/recipes-security/optee/optee-test.inc +1 -1
index aada243..33eda29 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM ="file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
  inherit python3native ptest
  require optee.inc
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
+DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
  SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
             file://run-ptest  \
meta-arm/recipes-security/optee/optee-test_3.14.0.bb deleted +0 -3
deleted file mode 100644
index 6367c27..0000000
@@ -1,3 +0,0 @@
-require optee-test.inc
-
-SRCREV = "f2eb88affbb7f028561b4fd5cbd049d5d704f741"
meta-arm/recipes-security/optee/optee-test_3.16.0.bb new file +3 -0
new file mode 100644
index 0000000..03f9c34
@@ -0,0 +1,3 @@
+require optee-test.inc
+
+SRCREV = "1cf0e6d2bdd1145370033d4e182634458528579d"
meta-arm/recipes-security/optee/optee.inc +3 -1
index f02a022..beae366 100644
@@ -26,3 +26,6 @@ EXTRA_OEMAKE += "V=1 \
                   OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                   TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
                  "
+# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3088):https://lists.yoctoproject.org/g/meta-arm/message/3088 Mute This Topic:https://lists.yoctoproject.org/mt/89404067/4354175
Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#6 lore raw
Quoted 7 lines · Abdellatif El Khlifi

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Cheers,

Alejandro

Quoted 595 lines

In ci/qemuarm64-secureboot.yml add:

ci/meta-openembedded.yml

Kind regards
------------------------------------------------------------------------
*From:* Sumit Garg <[email protected]>
*Sent:* 03 March 2022 05:31
*To:* Jon Mason <[email protected]>; Alejandro Hernandez <[email protected]>
*Cc:* [email protected] <[email protected]>; Vishnu Banavath <[email protected]>; Maxim Uvarov <[email protected]>; Peter Griffin <[email protected]>; Denys Dmytriyenko <[email protected]>; Drew Reed <[email protected]>; Abdellatif El Khlifi <[email protected]> *Subject:* Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16

Quoted 6 lines · Jon Mason
Quoted 4 lines · Alejandro Hernandez

Hi John,

Quoted 1 line · Jon Mason

On Fri, Feb 25, 2022 at 08:04:41PM -0700, Alejandro Enedino

Quoted 11 lines · Hernandez Samaniego
Quoted 11 lines
Quoted 11 lines
Quoted 6 lines

- Removes upstreamed patches for optee-examples
- Fixes optee-examples installation
- Includes new python3-cryptography dependency
- Fixes python3-cryptography to work with openssl

Tested on qemuarm64-secureboot via optee-examples xtest -l 15

With the new changes in python3-crypto, this is no longer working. I'm seeing the following error in CI.

--- Error summary ---
ERROR: Nothing PROVIDES 'python3-cryptography-native' (but

/builds/jonmason00/meta-arm/meta-arm/recipes-security/optee/optee-os_3.16.0.bb DEPENDS on or otherwise requires it). Close matches:

Quoted 11 lines
Quoted 11 lines
Quoted 9 lines

    python3-cython-native
    python3-pycryptodome-native
    python3-typogrify-native

I _think_ that adding meta-openembedded.yml being adding to the machines should fix it, but I'm not sure that is the right solution.

Thanks,
Jon

My apologies, I was testing with meta-oe/meta-python enabled hence

I didnt

Quoted 4 lines
Quoted 4 lines

see the error before.

I'm not sure its the right solution either, this dependency is

coming from

Quoted 1 line
Quoted 1 line

the pem_to_pub_c.py script which is now using python3-cyrptography

since

Quoted 1 line
Quoted 1 line

commit

https://github.com/OP-TEE/optee_os/commit/169eac19852d98d8ade821f913bbdd76faf52823

Quoted 1 line
Quoted 1 line

(this also means we could remove python3-cryptodome from the

dependencies as

Quoted 5 lines
Quoted 5 lines

well), as far as I can tell this creates a hard dependency, passing EXTRA_OEMAKE += " CFG_WITH_USER_TA=n" would avoid executing the script completely but I also dont think thats what we want.

Should we include meta-openembedded.yml?,  or what other choice do

we have?

Quoted 1 line
Quoted 1 line

create a python3-cyrptography recipe to meta-arm?, thoughts?

Yes, we should include meta-openembedded.yml as a dependency and remove python3-cryptodome from the dependencies.

-Sumit

Quoted 15 lines

OPTEE isn't an area I understand well (to know whether removing this is superior to adding the dependency in the files). So, I'm directly cc'ing contributors that I think will have an opinion to this response.

Thanks,
Jon

Quoted 6 lines

Cheers,

Alejandro

Quoted 1 line
Quoted 1 line
Signed-off-by Alejandro Enedino Hernandez

Samaniego<[email protected]>

Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines

---

   ....bbappend => optee-client_3.16.0.bbappend} |  0
   ...pend => optee-os-tadevkit_3.16.0.bbappend} |  0
   ...14.0.bbappend => optee-os_3.16.0.bbappend} |  0
   ....0.bbappend => optee-test_3.16.0.bbappend} |  0
.../optee-ftpm/optee-ftpm_git.bb              |  8 +-
.../optee/optee-client_3.14.0.bb              |  3 -
.../optee/optee-client_3.16.0.bb              |  3 +
.../recipes-security/optee/optee-examples.inc |  7 +-
...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++
...efault-cross-compiler-environment-se.patch | 84 

-------------------

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

...nable-plugins-installation-in-rootfs.patch | 37 -------- .../optee/optee-examples_3.14.0.bb            |  4 - .../optee/optee-examples_3.16.0.bb            |  3 + ..._3.14.0.bb => optee-os-tadevkit_3.16.0.bb} |  3 +-

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-os.inc  |  2 +- ...{optee-os_3.14.0.bb => optee-os_3.16.0.bb} |  2 +- .../recipes-security/optee/optee-test.inc     |  2 +- .../optee/optee-test_3.14.0.bb                |  3 - .../optee/optee-test_3.16.0.bb                |  3 + meta-arm/recipes-security/optee/optee.inc     |  3 +

   20 files changed, 73 insertions(+), 140 deletions(-)

   rename

meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bbappend => optee-client_3.16.0.bbappend} (100%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename

meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14.0.bbappend => optee-os-tadevkit_3.16.0.bbappend} (100%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename

meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappend => optee-os_3.16.0.bbappend} (100%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename

meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbappend => optee-test_3.16.0.bbappend} (100%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   delete mode 100644

meta-arm/recipes-security/optee/optee-client_3.14.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   create mode 100644

meta-arm/recipes-security/optee/optee-client_3.16.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   create mode 100644

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   delete mode 100644

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   delete mode 100644

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   delete mode 100644

meta-arm/recipes-security/optee/optee-examples_3.14.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   create mode 100644

meta-arm/recipes-security/optee/optee-examples_3.16.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename

meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.bb => optee-os-tadevkit_3.16.0.bb} (94%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename meta-arm/recipes-security/optee/{optee-os_3.14.0.bb

=> optee-os_3.16.0.bb} (76%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   delete mode 100644

meta-arm/recipes-security/optee/optee-test_3.14.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   create mode 100644

meta-arm/recipes-security/optee/optee-test_3.16.0.bb

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +0 -0

a/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 100%
rename from

meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 100%
rename from

meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

a/meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 100%
rename from

meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

a/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 100%
rename from

meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

index f2a74da..0eb64cd 100644

meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +0 -0
@@ -15,7 +15,9 @@ inherit deploy python3native

   LICENSE = "MIT"
   LIC_FILES_CHKSUM

="file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5 <file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5>"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

-DEPENDS = "python3-pycryptodome-native

python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

+DEPENDS = "python3-pycryptodome-native

python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit \

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

+    python3-cryptography-native \
+    "
FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"

meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +0 -0
@@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall = "\
        CFG_ARM64_ta_arm64=y \

   "
+# python3-cryptography needs the legacy provider, so set

OPENSSL_MODULES to the

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +3 -0
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
+

   PARALLEL_MAKE = ""
   do_compile() {

(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-client_3.14.0.bb b/meta-arm/recipes-security/optee/optee-client_3.14.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

Review

Quoted 9 lines

deleted file mode 100644
index be78b88..0000000

meta-arm/recipes-security/optee/optee-client_3.14.0.bb deleted +0 -3
@@ -1,3 +0,0 @@
-require optee-client.inc
-
-SRCREV = "06e1b32f6a7028e039c625b07cfc25fda0c17d53"
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-client_3.16.0.bb b/meta-arm/recipes-security/optee/optee-client_3.16.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

Review

Quoted 9 lines

new file mode 100644
index 0000000..4a36cbc

meta-arm/recipes-security/optee/optee-client_3.16.0.bb new file +3 -0
@@ -0,0 +1,3 @@
+require optee-client.inc
+
+SRCREV = "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-examples.inc HOMEPAGE

Quoted 4 lines

index 656722e..097f892 100644

meta-arm/recipes-security/optee/optee-examples.inc +0 -0
@@ -5,16 +5,14 @@ HOMEPAGE 

="https://github.com/linaro-swg/optee_examples"

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

   LICENSE = "BSD-2-Clause"
   LIC_FILES_CHKSUM

="file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30 <file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30>"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

-DEPENDS = "optee-client optee-os-tadevkit

python3-pycryptodome-native"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

+DEPENDS = "optee-client optee-os-tadevkit

python3-pycryptodome-native python3-cryptography-native"

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

   inherit python3native
   require optee.inc
   SRC_URI =

"git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https \

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

-file://0001-plugins-Honour-default-cross-compiler-environment-se.patch \

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

-file://0002-Makefile-Enable-plugins-installation-in-rootfs.patch \

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

meta-arm/recipes-security/optee/optee-examples.inc EXTRA_OEMAKE +=

Quoted 5 lines

-          " +file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch" EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
HOST_CROSS_COMPILE=${HOST_PREFIX} \

meta-arm/recipes-security/optee/optee-examples.inc +0 -0
@@ -25,6 +23,7 @@ EXTRA_OEMAKE += 

"TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

Review

Quoted 7 lines

   S = "${WORKDIR}/git"
   B = "${WORKDIR}/build"
+
   do_compile() {
       oe_runmake -C ${S}
   }

(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch b/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

new file mode 100644
index 0000000..70add62
--- /dev/null
+++

b/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

meta-arm/recipes-security/optee/optee-examples.inc line 1

Quoted 2 lines
meta-arm/recipes-security/optee/optee-examples.inc +1 -0
@@ -0,0 +1,46 @@
+From 11610debf750f15c7a104db7315dcd7d69e282a8 Mon Sep 17 

00:00:00 2001

Quoted 1 line
Quoted 1 line
Quoted 1 line

meta-arm/recipes-security/optee/optee-examples.inc line 2

Quoted 1 line
meta-arm/recipes-security/optee/optee-examples.inc +1 -0
+From: Alejandro Enedino Hernandez 

Samaniego<[email protected]>

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

meta-arm/recipes-security/optee/optee-examples.inc line 9

Quoted 7 lines
meta-arm/recipes-security/optee/optee-examples.inc +7 -0
+Date: Sat, 26 Feb 2022 01:52:26 +0000
+Subject: [PATCH] Makefile: Fix non-portable sh check for plugins
+
+Upstream-Status: Pending
+
+We previously held a patch that used "=" for comparison, but when
+that patch got upstreamed it was changed to "==" which is 

non-portable,

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta-arm/recipes-security/optee/optee-examples.inc +5 -0
+resulting in an error:
+
+/bin/sh: 6: [: acipher: unexpected operator
+/bin/sh: 6: [: plugins: unexpected operator
+/bin/sh: 6: [: hello_world: unexpected operator
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples.inc line 22

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples.inc +8 -0
+/bin/sh: 6: [: hotp: unexpected operator
+/bin/sh: 6: [: aes: unexpected operator
+/bin/sh: 6: [: random: unexpected operator
+/bin/sh: 6: [: secure_storage: unexpected operator
+
+if /bin/sh doesnt point to bash.
+
+Which in turn causes our do_install task to fail since 

plugins arent

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-examples.inc line 26

Quoted 4 lines
meta-arm/recipes-security/optee/optee-examples.inc +4 -0
+where we expect them to be.
+
+
+Signed-off-by: Alejandro Enedino Hernandez 

Samaniego<[email protected]>

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

meta-arm/recipes-security/optee/optee-examples.inc line 36

Quoted 10 lines
meta-arm/recipes-security/optee/optee-examples.inc +10 -0
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b3f16aa..9359d95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ prepare-for-rootfs: examples
+                         cp -p 

$$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

meta-arm/recipes-security/optee/optee-examples.inc line 41

Quoted 5 lines
meta-arm/recipes-security/optee/optee-examples.inc +5 -0
+                 fi; \
+                 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
+-                if [ $$example == plugins ]; then \
++                if [ $$example = plugins ]; then \
+                         cp -p plugins/syslog/*.plugin 

$(OUTPUT_DIR)/plugins/; \

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
meta-arm/recipes-security/optee/optee-examples.inc +5 -0
+                 fi; \
+         done
+--
+2.25.1
+
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch b/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

deleted file mode 100644
index 033e48c..0000000
---

a/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,84 +0,0 @@
-From 79c826c249001700007a6dffe80c3d61ff4428ef Mon Sep 17 

00:00:00 2001

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

Review line 4

Quoted 3 lines
(quoted diff) +0 -3
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 13:54:30 +0530
-Subject: [PATCH 1/2] plugins: Honour default cross compiler 

environment setup

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Review line 6

Quoted 2 lines
(quoted diff) +0 -2
-
-Honour default $(CC), $(CFLAGS) and $(LDFLAGS) variables. 

Without this

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 3 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -3
-plugins example fails to build for OE/Yocto.
-
-Upstream-Status: Submitted 

[https://github.com/linaro-swg/optee_examples/pull/87]

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -7
-
-Signed-off-by: Sumit Garg<[email protected]>
----
- plugins/Makefile        |  2 +-
- plugins/host/Makefile   |  2 +-
- plugins/syslog/Makefile | 16 ++++++++++++----
- 3 files changed, 14 insertions(+), 6 deletions(-)
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -8
-
-diff --git a/plugins/Makefile b/plugins/Makefile
-index 2372b38..ea472b4 100644
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -8,7 +8,7 @@ TA_CROSS_COMPILE ?= $(CROSS_COMPILE)
- all:
-         $(MAKE) -C host 

CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review line 25

Quoted 1 line
(quoted diff) +0 -1
-         $(MAKE) -C ta CROSS_COMPILE="$(TA_CROSS_COMPILE)" 

LDFLAGS=""

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Review line 27

Quoted 2 lines
(quoted diff) +0 -2
--        $(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)"
-+        $(MAKE) -C syslog 

CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables

Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -25
-
- .PHONY: clean
- clean:
-diff --git a/plugins/host/Makefile b/plugins/host/Makefile
-index 7285104..76244c7 100644
---- a/plugins/host/Makefile
-+++ b/plugins/host/Makefile
-@@ -20,7 +20,7 @@ BINARY = optee_example_plugins
- all: $(BINARY)
-
- $(BINARY): $(OBJS)
--        $(CC) -o $@ $< $(LDADD)
-+        $(CC) $(LDFLAGS) -o $@ $< $(LDADD)
-
- .PHONY: clean
- clean:
-diff --git a/plugins/syslog/Makefile b/plugins/syslog/Makefile
-index 62d916a..71f5f92 100644
---- a/plugins/syslog/Makefile
-+++ b/plugins/syslog/Makefile
-@@ -1,3 +1,11 @@
-+CC      ?= $(CROSS_COMPILE)gcc
-+LD      ?= $(CROSS_COMPILE)ld
-+AR      ?= $(CROSS_COMPILE)ar
-+NM      ?= $(CROSS_COMPILE)nm
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -8
-+OBJCOPY ?= $(CROSS_COMPILE)objcopy
-+OBJDUMP ?= $(CROSS_COMPILE)objdump
-+READELF ?= $(CROSS_COMPILE)readelf
-+
- PLUGIN_UUID = 96bcf744-4f72-4866-bf1d-8634fd9c65e5
-
- PLUGIN                  = $(PLUGIN_UUID).plugin
-@@ -6,17 +14,17 @@ PLUGIN_OBJ            = $(patsubst %.c, 

%.o, $(PLUGIN_SRS))

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 3 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -3
- PLUGIN_INCLUDES_DIR     = $(CURDIR) $(TEEC_EXPORT)/include
-
- PLUGIN_INCLUDES         = $(addprefix -I, 

$(PLUGIN_INCLUDES_DIR))

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 10 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -10
--PLUGIN_CCFLAGS          = -Wall -fPIC
--PLUGIN_LDFLAGS          = -shared
-+PLUGIN_CCFLAGS          = $(CFLAGS) -Wall -fPIC
-+PLUGIN_LDFLAGS          = $(LDFLAGS) -shared
-
- .PHONY: all
- all: $(PLUGIN)
-
- $(PLUGIN): $(PLUGIN_OBJ)
--        $(CROSS_COMPILE)gcc $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) 

-o $@

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch

Quoted 4 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -4
-+        $(CC) $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-
- %.o: %.c
--        $(CROSS_COMPILE)gcc $(PLUGIN_CCFLAGS) 

$(PLUGIN_INCLUDES) -c $*.c -o $*.o

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review line 78

Quoted 1 line
(quoted diff) +0 -1
-+        $(CC) $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c 

-o $*.o

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

Review

Quoted 7 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -6
-
- .PHONY: clean
- clean:
---
-2.25.1
-
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch b/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

deleted file mode 100644
index 80e6b5f..0000000
---

a/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

Review line 1

Quoted 3 lines

+++ /dev/null

(quoted diff) +0 -1
@@ -1,37 +0,0 @@
-From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17 

00:00:00 2001

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch

Quoted 5 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -5
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 14:20:10 +0530
-Subject: [PATCH] Makefile: Enable plugins installation in rootfs
-
-Upstream-Status: Submitted 

[https://github.com/linaro-swg/optee_examples/pull/87]

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -10
-
-Signed-off-by: Sumit Garg<[email protected]>
-
----
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index a275842..9359d95 100644
---- a/Makefile
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -8
-+++ b/Makefile
-@@ -25,14 +25,19 @@ prepare-for-rootfs: examples
-         @mkdir -p $(OUTPUT_DIR)
-         @mkdir -p $(OUTPUT_DIR)/ta
-         @mkdir -p $(OUTPUT_DIR)/ca
-+        @mkdir -p $(OUTPUT_DIR)/plugins
-         @for example in $(EXAMPLE_LIST); do \
-                 if [ -e 

$$example/host/optee_example_$$example ]; then \

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review line 25

Quoted 1 line
(quoted diff) +0 -1
-                         cp -p 

$$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch

Quoted 4 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -4
-                 fi; \
-                 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
-+                if [ $$example = plugins ]; then \
-+                        cp -p plugins/syslog/*.plugin 

$(OUTPUT_DIR)/plugins/; \

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -8
-+                fi; \
-         done
-
- prepare-for-rootfs-clean:
-         @rm -rf $(OUTPUT_DIR)/ta
-         @rm -rf $(OUTPUT_DIR)/ca
-+        @rm -rf $(OUTPUT_DIR)/plugins
-         @rmdir --ignore-fail-on-non-empty $(OUTPUT_DIR) || 

test ! -e $(OUTPUT_DIR)

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb b/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

Review

Quoted 10 lines

deleted file mode 100644
index f2b5f7d..0000000

meta-arm/recipes-security/optee/optee-examples_3.14.0.bb deleted +0 -4
@@ -1,4 +0,0 @@
-require optee-examples.inc
-
-SRCREV = "e9c870525af8f7e7fccf575a0ca5394ce55adcec"
-
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb b/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

Review

Quoted 9 lines

new file mode 100644
index 0000000..b5f6269

meta-arm/recipes-security/optee/optee-examples_3.16.0.bb new file +3 -0
@@ -0,0 +1,3 @@
+require optee-examples.inc
+
+SRCREV = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 94%
rename from

meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

index 0d37a52..c710e27 100644

meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +0 -0
@@ -1,10 +1,11 @@

   FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"

meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +1 -1
-require optee-os_3.14.0.bb
+require optee-os_3.16.0.bb
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

Review

Quoted 8 lines

   SUMMARY = "OP-TEE Trusted OS TA devkit" DESCRIPTION = "OP-TEE TA devkit for build TAs" HOMEPAGE ="https://www.op-tee.org/"
+
   do_install() {
       #install TA devkit
       install -d ${D}${includedir}/optee/export-user_ta/

(quoted diff) +0 -0

b/meta-arm/recipes-security/optee/optee-os.inc

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

meta-arm/recipes-security/optee/optee-os.inc

Quoted 7 lines

index 1506a58..57c64fd 100644

meta-arm/recipes-security/optee/optee-os.inc +0 -0
@@ -10,7 +10,7 @@ require optee.inc

   CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"

meta-arm/recipes-security/optee/optee-os.inc +1 -1
-DEPENDS = "python3-pycryptodome-native python3-pyelftools-native"
+DEPENDS = "python3-pycryptodome-native 

python3-pyelftools-native python3-cryptography-native"

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Review

Quoted 2 lines

   DEPENDS:append:toolchain-clang = " compiler-rt"

(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-os_3.14.0.bb b/meta-arm/recipes-security/optee/optee-os_3.16.0.bb

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

similarity index 76%
rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb index 95d82bb..873e964 100644

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +0 -0
@@ -1,6 +1,6 @@

   require optee-os.inc

meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +1 -1
-SRCREV = "d21befa5e53eae9db469eba1685f5aa5c6f92c2f"
+SRCREV = "d0b742d1564834dac903f906168d7357063d5459"

   SRC_URI:append = " \
file://0006-allow-setting-sysroot-for-libgcc-lookup.patch

<file://0006-allow-setting-sysroot-for-libgcc-lookup.patch>  \

Quoted 1 line
Quoted 1 line
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta-arm/recipes-security/optee/optee-test.inc

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-test.inc LIC_FILES_CHKSUM

Quoted 4 lines

index aada243..33eda29 100644

meta-arm/recipes-security/optee/optee-test.inc +0 -0
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM 

="file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa <file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa>"

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

   inherit python3native ptest
   require optee.inc
-DEPENDS = "optee-client optee-os-tadevkit

python3-pycryptodome-native"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

+DEPENDS = "optee-client optee-os-tadevkit

python3-pycryptodome-native python3-cryptography-native"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   SRC_URI =

"git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Review

Quoted 2 lines

file://run-ptest <file://run-ptest> \

(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-test_3.14.0.bb b/meta-arm/recipes-security/optee/optee-test_3.14.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

Review

Quoted 9 lines

deleted file mode 100644
index 6367c27..0000000

meta-arm/recipes-security/optee/optee-test_3.14.0.bb deleted +0 -3
@@ -1,3 +0,0 @@
-require optee-test.inc
-
-SRCREV = "f2eb88affbb7f028561b4fd5cbd049d5d704f741"
(quoted diff) +0 -0

a/meta-arm/recipes-security/optee/optee-test_3.16.0.bb b/meta-arm/recipes-security/optee/optee-test_3.16.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

Review

Quoted 9 lines

new file mode 100644
index 0000000..03f9c34

meta-arm/recipes-security/optee/optee-test_3.16.0.bb new file +3 -0
@@ -0,0 +1,3 @@
+require optee-test.inc
+
+SRCREV = "1cf0e6d2bdd1145370033d4e182634458528579d"
(quoted diff) +0 -0

b/meta-arm/recipes-security/optee/optee.inc

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

index f02a022..beae366 100644

meta-arm/recipes-security/optee/optee.inc +0 -0
@@ -26,3 +26,6 @@ EXTRA_OEMAKE += "V=1 \
 OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
 TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \

                   "
+# python3-cryptography needs the legacy provider, so set

OPENSSL_MODULES to the

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
meta-arm/recipes-security/optee/optee.inc +2 -1
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3096):https://lists.yoctoproject.org/g/meta-arm/message/3096 Mute This Topic:https://lists.yoctoproject.org/mt/89404067/4354175
Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#7 lore raw
Quoted 18 lines · Alejandro Hernandez Samaniego
Quoted 8 lines · Abdellatif El Khlifi

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

Quoted 6 lines

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:

https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
https://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:

https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

Signature · 1 line
Denys
Quoted 610 lines

Cheers,

Alejandro

Quoted 605 lines

In ci/qemuarm64-secureboot.yml add:

ci/meta-openembedded.yml

Kind regards
------------------------------------------------------------------------
*From:* Sumit Garg <[email protected]>
*Sent:* 03 March 2022 05:31
*To:* Jon Mason <[email protected]>; Alejandro Hernandez <[email protected]>
*Cc:* [email protected] <[email protected]>; Vishnu Banavath <[email protected]>; Maxim Uvarov <[email protected]>; Peter Griffin <[email protected]>; Denys Dmytriyenko <[email protected]>; Drew Reed <[email protected]>; Abdellatif El Khlifi <[email protected]>
*Subject:* Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16

Quoted 6 lines · Jon Mason
Quoted 4 lines · Alejandro Hernandez

Hi John,

Quoted 1 line · Jon Mason

On Fri, Feb 25, 2022 at 08:04:41PM -0700, Alejandro Enedino

Quoted 11 lines · Hernandez Samaniego
Quoted 11 lines
Quoted 11 lines
Quoted 6 lines

- Removes upstreamed patches for optee-examples
- Fixes optee-examples installation
- Includes new python3-cryptography dependency
- Fixes python3-cryptography to work with openssl

Tested on qemuarm64-secureboot via optee-examples xtest -l 15

With the new changes in python3-crypto, this is no longer working. I'm seeing the following error in CI.

--- Error summary ---
ERROR: Nothing PROVIDES 'python3-cryptography-native' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee/optee-os_3.16.0.bb

DEPENDS on or otherwise requires it). Close matches:

Quoted 11 lines
Quoted 11 lines
Quoted 9 lines

    python3-cython-native
    python3-pycryptodome-native
    python3-typogrify-native

I _think_ that adding meta-openembedded.yml being adding to the machines should fix it, but I'm not sure that is the right solution.

Thanks,
Jon

My apologies, I was testing with meta-oe/meta-python enabled

hence I didnt

Quoted 4 lines
Quoted 4 lines

see the error before.

I'm not sure its the right solution either, this dependency is

coming from

Quoted 1 line
Quoted 1 line

the pem_to_pub_c.py script which is now using

python3-cyrptography since

Quoted 2 lines
Quoted 2 lines

commit https://github.com/OP-TEE/optee_os/commit/169eac19852d98d8ade821f913bbdd76faf52823
(this also means we could remove python3-cryptodome from the

dependencies as

Quoted 5 lines
Quoted 5 lines

well), as far as I can tell this creates a hard dependency, passing EXTRA_OEMAKE += " CFG_WITH_USER_TA=n" would avoid executing the script completely but I also dont think thats what we want.

Should we include meta-openembedded.yml?,  or what other

choice do we have?

Quoted 1 line
Quoted 1 line

create a python3-cyrptography recipe to meta-arm?, thoughts?

Yes, we should include meta-openembedded.yml as a dependency and remove python3-cryptodome from the dependencies.

-Sumit

Quoted 15 lines

OPTEE isn't an area I understand well (to know whether removing this is superior to adding the dependency in the files). So, I'm directly cc'ing contributors that I think will have an opinion to this response.

Thanks,
Jon

Quoted 6 lines

Cheers,

Alejandro

Quoted 1 line
Quoted 1 line
Signed-off-by Alejandro Enedino Hernandez

Samaniego<[email protected]>

Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines

---

   ....bbappend => optee-client_3.16.0.bbappend} |  0
   ...pend => optee-os-tadevkit_3.16.0.bbappend} |  0
   ...14.0.bbappend => optee-os_3.16.0.bbappend} |  0
   ....0.bbappend => optee-test_3.16.0.bbappend} |  0
.../optee-ftpm/optee-ftpm_git.bb              |  8 +-
.../optee/optee-client_3.14.0.bb              |  3 -
.../optee/optee-client_3.16.0.bb              |  3 +
.../recipes-security/optee/optee-examples.inc |  7 +-
...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++
...efault-cross-compiler-environment-se.patch | 84

-------------------

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

...nable-plugins-installation-in-rootfs.patch | 37 -------- .../optee/optee-examples_3.14.0.bb            |  4 - .../optee/optee-examples_3.16.0.bb            |  3 + ..._3.14.0.bb => optee-os-tadevkit_3.16.0.bb} |  3 +-

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-os.inc  |  2 +- ...{optee-os_3.14.0.bb => optee-os_3.16.0.bb} |  2 +- .../recipes-security/optee/optee-test.inc     |  2 +- .../optee/optee-test_3.14.0.bb                |  3 - .../optee/optee-test_3.16.0.bb                |  3 + meta-arm/recipes-security/optee/optee.inc     |  3 +

   20 files changed, 73 insertions(+), 140 deletions(-)

   rename

meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bbappend => optee-client_3.16.0.bbappend} (100%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14.0.bbappend

=> optee-os-tadevkit_3.16.0.bbappend} (100%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename

meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappend => optee-os_3.16.0.bbappend} (100%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename

meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbappend => optee-test_3.16.0.bbappend} (100%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   delete mode 100644

meta-arm/recipes-security/optee/optee-client_3.14.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   create mode 100644

meta-arm/recipes-security/optee/optee-client_3.16.0.bb

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

   create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch delete mode 100644

meta-arm/recipes-security/optee/optee-examples_3.14.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   create mode 100644

meta-arm/recipes-security/optee/optee-examples_3.16.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename

meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.bb => optee-os-tadevkit_3.16.0.bb} (94%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   rename

meta-arm/recipes-security/optee/{optee-os_3.14.0.bb => optee-os_3.16.0.bb} (76%)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   delete mode 100644

meta-arm/recipes-security/optee/optee-test_3.14.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   create mode 100644

meta-arm/recipes-security/optee/optee-test_3.16.0.bb

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

diff --git

a/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 100%
rename from

meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend

diff --git

a/meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 100%
rename from

meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

diff --git

a/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 100%
rename from

meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

diff --git

a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

index f2a74da..0eb64cd 100644

meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +0 -0
@@ -15,7 +15,9 @@ inherit deploy python3native

   LICENSE = "MIT"
   LIC_FILES_CHKSUM

="file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5 <file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5>"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

-DEPENDS = "python3-pycryptodome-native

python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

+DEPENDS = "python3-pycryptodome-native

python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit \

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

+    python3-cryptography-native \
+    "
FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"

meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +0 -0
@@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall = "\
        CFG_ARM64_ta_arm64=y \

   "
+# python3-cryptography needs the legacy provider, so set

OPENSSL_MODULES to the

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +3 -0
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
+

   PARALLEL_MAKE = ""
   do_compile() {
diff --git

a/meta-arm/recipes-security/optee/optee-client_3.14.0.bb b/meta-arm/recipes-security/optee/optee-client_3.14.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

deleted file mode 100644
index be78b88..0000000

meta-arm/recipes-security/optee/optee-client_3.14.0.bb deleted +0 -3
@@ -1,3 +0,0 @@
-require optee-client.inc
-
-SRCREV = "06e1b32f6a7028e039c625b07cfc25fda0c17d53"

diff --git

a/meta-arm/recipes-security/optee/optee-client_3.16.0.bb b/meta-arm/recipes-security/optee/optee-client_3.16.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

new file mode 100644
index 0000000..4a36cbc

meta-arm/recipes-security/optee/optee-client_3.16.0.bb new file +3 -0
@@ -0,0 +1,3 @@
+require optee-client.inc
+
+SRCREV = "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"

diff --git

a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-examples.inc HOMEPAGE

Quoted 4 lines

index 656722e..097f892 100644

meta-arm/recipes-security/optee/optee-examples.inc +0 -0
@@ -5,16 +5,14 @@ HOMEPAGE

="https://github.com/linaro-swg/optee_examples"

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

   LICENSE = "BSD-2-Clause"
   LIC_FILES_CHKSUM

="file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30 <file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30>"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

-DEPENDS = "optee-client optee-os-tadevkit

python3-pycryptodome-native"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

+DEPENDS = "optee-client optee-os-tadevkit

python3-pycryptodome-native python3-cryptography-native"

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

   inherit python3native
   require optee.inc
   SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https

\

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

-file://0001-plugins-Honour-default-cross-compiler-environment-se.patch

\

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

-file://0002-Makefile-Enable-plugins-installation-in-rootfs.patch \

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

meta-arm/recipes-security/optee/optee-examples.inc EXTRA_OEMAKE +=

Quoted 5 lines

-          " +file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch" EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
HOST_CROSS_COMPILE=${HOST_PREFIX} \

meta-arm/recipes-security/optee/optee-examples.inc +0 -0
@@ -25,6 +23,7 @@ EXTRA_OEMAKE +=

"TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

   S = "${WORKDIR}/git"
   B = "${WORKDIR}/build"
+
   do_compile() {
       oe_runmake -C ${S}

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch line 1

Quoted 8 lines

   }

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +1 -0
new file mode 100644
index 0000000..70add62
@@ -0,0 +1,46 @@
+From 11610debf750f15c7a104db7315dcd7d69e282a8 Mon Sep 17

00:00:00 2001

Quoted 1 line
Quoted 1 line
Quoted 1 line

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch line 2

Quoted 1 line
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +1 -0
+From: Alejandro Enedino Hernandez

Samaniego<[email protected]>

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch line 9

Quoted 7 lines
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +7 -0
+Date: Sat, 26 Feb 2022 01:52:26 +0000
+Subject: [PATCH] Makefile: Fix non-portable sh check for plugins
+
+Upstream-Status: Pending
+
+We previously held a patch that used "=" for comparison, but when
+that patch got upstreamed it was changed to "==" which is

non-portable,

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +5 -0
+resulting in an error:
+
+/bin/sh: 6: [: acipher: unexpected operator
+/bin/sh: 6: [: plugins: unexpected operator
+/bin/sh: 6: [: hello_world: unexpected operator
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch line 22

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +8 -0
+/bin/sh: 6: [: hotp: unexpected operator
+/bin/sh: 6: [: aes: unexpected operator
+/bin/sh: 6: [: random: unexpected operator
+/bin/sh: 6: [: secure_storage: unexpected operator
+
+if /bin/sh doesnt point to bash.
+
+Which in turn causes our do_install task to fail since

plugins arent

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch line 26

Quoted 4 lines
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +4 -0
+where we expect them to be.
+
+
+Signed-off-by: Alejandro Enedino Hernandez

Samaniego<[email protected]>

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch line 36

Quoted 10 lines
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +10 -0
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b3f16aa..9359d95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ prepare-for-rootfs: examples
+                         cp -p

$$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch line 41

Quoted 5 lines
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +5 -0
+                 fi; \
+                 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
+-                if [ $$example == plugins ]; then \
++                if [ $$example = plugins ]; then \
+                         cp -p plugins/syslog/*.plugin

$(OUTPUT_DIR)/plugins/; \

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +4 -0
+                 fi; \
+         done
+--
+2.25.1
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 1

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch new file +1 -0
+
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -1
deleted file mode 100644
index 033e48c..0000000
@@ -1,84 +0,0 @@
-From 79c826c249001700007a6dffe80c3d61ff4428ef Mon Sep 17

00:00:00 2001

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 4

Quoted 3 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -3
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 13:54:30 +0530
-Subject: [PATCH 1/2] plugins: Honour default cross

compiler environment setup

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 6

Quoted 2 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -2
-
-Honour default $(CC), $(CFLAGS) and $(LDFLAGS) variables.

Without this

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 9

Quoted 3 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -3
-plugins example fails to build for OE/Yocto.
-
-Upstream-Status: Submitted

[https://github.com/linaro-swg/optee_examples/pull/87]

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -7
-
-Signed-off-by: Sumit Garg<[email protected]>
----
- plugins/Makefile        |  2 +-
- plugins/host/Makefile   |  2 +-
- plugins/syslog/Makefile | 16 ++++++++++++----
- 3 files changed, 14 insertions(+), 6 deletions(-)
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 24

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -8
-
-diff --git a/plugins/Makefile b/plugins/Makefile
-index 2372b38..ea472b4 100644
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -8,7 +8,7 @@ TA_CROSS_COMPILE ?= $(CROSS_COMPILE)
- all:
-         $(MAKE) -C host

CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables

Quoted 1 line
Quoted 1 line
Quoted 1 line

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 25

Quoted 1 line
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -1
-         $(MAKE) -C ta

CROSS_COMPILE="$(TA_CROSS_COMPILE)" LDFLAGS=""

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 27

Quoted 2 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -2
--        $(MAKE) -C syslog CROSS_COMPILE="$(HOST_CROSS_COMPILE)"
-+        $(MAKE) -C syslog

CROSS_COMPILE="$(HOST_CROSS_COMPILE)" --no-builtin-variables

Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -25
-
- .PHONY: clean
- clean:
-diff --git a/plugins/host/Makefile b/plugins/host/Makefile
-index 7285104..76244c7 100644
---- a/plugins/host/Makefile
-+++ b/plugins/host/Makefile
-@@ -20,7 +20,7 @@ BINARY = optee_example_plugins
- all: $(BINARY)
-
- $(BINARY): $(OBJS)
--        $(CC) -o $@ $< $(LDADD)
-+        $(CC) $(LDFLAGS) -o $@ $< $(LDADD)
-
- .PHONY: clean
- clean:
-diff --git a/plugins/syslog/Makefile b/plugins/syslog/Makefile
-index 62d916a..71f5f92 100644
---- a/plugins/syslog/Makefile
-+++ b/plugins/syslog/Makefile
-@@ -1,3 +1,11 @@
-+CC      ?= $(CROSS_COMPILE)gcc
-+LD      ?= $(CROSS_COMPILE)ld
-+AR      ?= $(CROSS_COMPILE)ar
-+NM      ?= $(CROSS_COMPILE)nm
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 60

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -8
-+OBJCOPY ?= $(CROSS_COMPILE)objcopy
-+OBJDUMP ?= $(CROSS_COMPILE)objdump
-+READELF ?= $(CROSS_COMPILE)readelf
-+
- PLUGIN_UUID = 96bcf744-4f72-4866-bf1d-8634fd9c65e5
-
- PLUGIN                  = $(PLUGIN_UUID).plugin
-@@ -6,17 +14,17 @@ PLUGIN_OBJ            = $(patsubst

%.c, %.o, $(PLUGIN_SRS))

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 63

Quoted 3 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -3
- PLUGIN_INCLUDES_DIR     = $(CURDIR) $(TEEC_EXPORT)/include
-
- PLUGIN_INCLUDES         = $(addprefix -I,

$(PLUGIN_INCLUDES_DIR))

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 73

Quoted 10 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -10
--PLUGIN_CCFLAGS          = -Wall -fPIC
--PLUGIN_LDFLAGS          = -shared
-+PLUGIN_CCFLAGS          = $(CFLAGS) -Wall -fPIC
-+PLUGIN_LDFLAGS          = $(LDFLAGS) -shared
-
- .PHONY: all
- all: $(PLUGIN)
-
- $(PLUGIN): $(PLUGIN_OBJ)
--        $(CROSS_COMPILE)gcc $(PLUGIN_LDFLAGS)

$(PLUGIN_OBJ) -o $@

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 77

Quoted 4 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -4
-+        $(CC) $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
-
- %.o: %.c
--        $(CROSS_COMPILE)gcc $(PLUGIN_CCFLAGS)

$(PLUGIN_INCLUDES) -c $*.c -o $*.o

Quoted 1 line
Quoted 1 line
Quoted 1 line

meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch line 78

Quoted 1 line
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -1
-+        $(CC) $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c

$*.c -o $*.o

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -5
-
- .PHONY: clean
- clean:
---
-2.25.1
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch line 1

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-default-cross-compiler-environment-se.patch deleted +0 -1
-
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -1
deleted file mode 100644
index 80e6b5f..0000000
@@ -1,37 +0,0 @@
-From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17

00:00:00 2001

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch line 6

Quoted 5 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -5
-From: Sumit Garg<[email protected]>
-Date: Tue, 20 Jul 2021 14:20:10 +0530
-Subject: [PATCH] Makefile: Enable plugins installation in rootfs
-
-Upstream-Status: Submitted

[https://github.com/linaro-swg/optee_examples/pull/87]

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -10
-
-Signed-off-by: Sumit Garg<[email protected]>
-
----
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index a275842..9359d95 100644
---- a/Makefile
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch line 24

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -8
-+++ b/Makefile
-@@ -25,14 +25,19 @@ prepare-for-rootfs: examples
-         @mkdir -p $(OUTPUT_DIR)
-         @mkdir -p $(OUTPUT_DIR)/ta
-         @mkdir -p $(OUTPUT_DIR)/ca
-+        @mkdir -p $(OUTPUT_DIR)/plugins
-         @for example in $(EXAMPLE_LIST); do \
-                 if [ -e

$$example/host/optee_example_$$example ]; then \

Quoted 1 line
Quoted 1 line
Quoted 1 line

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch line 25

Quoted 1 line
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -1
-                         cp -p

$$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch line 29

Quoted 4 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -4
-                 fi; \
-                 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
-+                if [ $$example = plugins ]; then \
-+                        cp -p plugins/syslog/*.plugin

$(OUTPUT_DIR)/plugins/; \

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch line 37

Quoted 8 lines
meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugins-installation-in-rootfs.patch deleted +0 -8
-+                fi; \
-         done
-
- prepare-for-rootfs-clean:
-         @rm -rf $(OUTPUT_DIR)/ta
-         @rm -rf $(OUTPUT_DIR)/ca
-+        @rm -rf $(OUTPUT_DIR)/plugins
-         @rmdir --ignore-fail-on-non-empty $(OUTPUT_DIR)

|| test ! -e $(OUTPUT_DIR)

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

diff --git

a/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb b/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

deleted file mode 100644
index f2b5f7d..0000000

meta-arm/recipes-security/optee/optee-examples_3.14.0.bb deleted +0 -4
@@ -1,4 +0,0 @@
-require optee-examples.inc
-
-SRCREV = "e9c870525af8f7e7fccf575a0ca5394ce55adcec"
-

diff --git

a/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb b/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

new file mode 100644
index 0000000..b5f6269

meta-arm/recipes-security/optee/optee-examples_3.16.0.bb new file +3 -0
@@ -0,0 +1,3 @@
+require optee-examples.inc
+
+SRCREV = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"

diff --git

a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

similarity index 94%
rename from

meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

rename to

meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

index 0d37a52..c710e27 100644

meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +0 -0
@@ -1,10 +1,11 @@

   FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"

meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb +1 -1
-require optee-os_3.14.0.bb
+require optee-os_3.16.0.bb
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

Review

Quoted 8 lines

   SUMMARY = "OP-TEE Trusted OS TA devkit" DESCRIPTION = "OP-TEE TA devkit for build TAs" HOMEPAGE ="https://www.op-tee.org/"
+
   do_install() {
       #install TA devkit
       install -d ${D}${includedir}/optee/export-user_ta/

(quoted diff) +0 -0

b/meta-arm/recipes-security/optee/optee-os.inc

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

meta-arm/recipes-security/optee/optee-os.inc

Quoted 7 lines

index 1506a58..57c64fd 100644

meta-arm/recipes-security/optee/optee-os.inc +0 -0
@@ -10,7 +10,7 @@ require optee.inc

   CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"

meta-arm/recipes-security/optee/optee-os.inc +1 -1
-DEPENDS = "python3-pycryptodome-native python3-pyelftools-native"
+DEPENDS = "python3-pycryptodome-native

python3-pyelftools-native python3-cryptography-native"

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

   DEPENDS:append:toolchain-clang = " compiler-rt" diff --git

a/meta-arm/recipes-security/optee/optee-os_3.14.0.bb b/meta-arm/recipes-security/optee/optee-os_3.16.0.bb

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

similarity index 76%
rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb index 95d82bb..873e964 100644

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +0 -0
@@ -1,6 +1,6 @@

   require optee-os.inc

meta-arm/recipes-security/optee/optee-os_3.16.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.14.0.bb +1 -1
-SRCREV = "d21befa5e53eae9db469eba1685f5aa5c6f92c2f"
+SRCREV = "d0b742d1564834dac903f906168d7357063d5459"

   SRC_URI:append = " \
file://0006-allow-setting-sysroot-for-libgcc-lookup.patch

<file://0006-allow-setting-sysroot-for-libgcc-lookup.patch>  \

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

diff --git

a/meta-arm/recipes-security/optee/optee-test.inc
b/meta-arm/recipes-security/optee/optee-test.inc

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

meta-arm/recipes-security/optee/optee-test.inc LIC_FILES_CHKSUM

Quoted 4 lines

index aada243..33eda29 100644

meta-arm/recipes-security/optee/optee-test.inc +0 -0
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM

="file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa <file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa>"

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

   inherit python3native ptest
   require optee.inc
-DEPENDS = "optee-client optee-os-tadevkit

python3-pycryptodome-native"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

+DEPENDS = "optee-client optee-os-tadevkit

python3-pycryptodome-native python3-cryptography-native"

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

   SRC_URI =

"git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

file://run-ptest <file://run-ptest> \
diff --git

a/meta-arm/recipes-security/optee/optee-test_3.14.0.bb b/meta-arm/recipes-security/optee/optee-test_3.14.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

deleted file mode 100644
index 6367c27..0000000

meta-arm/recipes-security/optee/optee-test_3.14.0.bb deleted +0 -3
@@ -1,3 +0,0 @@
-require optee-test.inc
-
-SRCREV = "f2eb88affbb7f028561b4fd5cbd049d5d704f741"

diff --git

a/meta-arm/recipes-security/optee/optee-test_3.16.0.bb b/meta-arm/recipes-security/optee/optee-test_3.16.0.bb

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

Review

Quoted 9 lines

new file mode 100644
index 0000000..03f9c34

meta-arm/recipes-security/optee/optee-test_3.16.0.bb new file +3 -0
@@ -0,0 +1,3 @@
+require optee-test.inc
+
+SRCREV = "1cf0e6d2bdd1145370033d4e182634458528579d"
(quoted diff) +0 -0

b/meta-arm/recipes-security/optee/optee.inc

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

index f02a022..beae366 100644

meta-arm/recipes-security/optee/optee.inc +0 -0
@@ -26,3 +26,6 @@ EXTRA_OEMAKE += "V=1 \
 OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
 TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \

                   "
+# python3-cryptography needs the legacy provider, so set

OPENSSL_MODULES to the

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
meta-arm/recipes-security/optee/optee.inc +2 -1
+# right path until this is relocated automatically.
+export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules"
--

2.25.1

#8 lore raw
Quoted 30 lines · Denys Dmytriyenko
Quoted 16 lines · Alejandro Hernandez Samaniego
Quoted 8 lines · Abdellatif El Khlifi

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

Quoted 6 lines

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:

Quoted 8 lines

https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
https://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:

https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

Alejandro

#9 lore raw
Quoted 49 lines · Alejandro Hernandez Samaniego

On 3/3/22 23:37, Denys Dmytriyenko wrote:

On Thu, Mar 03, 2022 at 09:11:28PM +0000, Alejandro Hernandez Samaniego wrote:

On 3/3/22 10:55, Abdellatif El Khlifi wrote:

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:
https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516cahttps://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:
https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Quoted 3 lines

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

I have suggested moving python3-cryptography (also

python3-cryptography-vectors) to oe-core previously. It is heavily used for cryptography and needs to be kept up to date which is much more likely in oe-core.

This also means python3-pyo3, pyo3.bbclass, python3-setuptools-rust-native and the setuptools_rust.bbclass would also move to oe-core.

And then some tests. And documentation.

Quoted 14 lines

Alejandro

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#3107):
https://lists.yoctoproject.org/g/meta-arm/message/3107
Mute This Topic: https://lists.yoctoproject.org/mt/89404067/924729
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#10 lore raw

Hi guys,

Thanks for the feedback.

Since the machine is in meta-arm (meta-arm/conf/machine/qemuarm64-secureboot.conf), it makes sense to add the meta-python layer dependency as detailed below.

It works, meta-python and python3-cryptography are detected. Please have a look at the logs below.

So, technically it works. But let's see what Jon and Ross think.

Suggested changes:

In ci/qemuarm64-secureboot.yml add:

- ci/meta-openembedded.yml

In meta-arm/conf/layer.conf add:

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

Before the changes:

bitbake-layers show-layers

NOTE: Starting bitbake server...
layer path priority
==========================================================================

meta-arm              /home/abdelk01/Work/qemu/meta-arm/meta-arm  5
meta-arm-bsp          /home/abdelk01/Work/qemu/meta-arm/meta-arm-bsp  5
meta-arm-toolchain    /home/abdelk01/Work/qemu/meta-arm/meta-arm-toolchain  5
meta                  /home/abdelk01/Work/qemu/poky/meta        5
meta-poky             /home/abdelk01/Work/qemu/poky/meta-poky   5

After the changes:

bitbake-layers show-layers

NOTE: Starting bitbake server...
layer path priority
==========================================================================

meta-arm              /home/abdelk01/Work/qemu/meta-arm/meta-arm  5
meta-arm-bsp          /home/abdelk01/Work/qemu/meta-arm/meta-arm-bsp  5
meta-arm-toolchain    /home/abdelk01/Work/qemu/meta-arm/meta-arm-toolchain  5
meta-filesystems      /home/abdelk01/Work/qemu/meta-openembedded/meta-filesystems  5
meta-networking       /home/abdelk01/Work/qemu/meta-openembedded/meta-networking  5
meta-oe               /home/abdelk01/Work/qemu/meta-openembedded/meta-oe  5
meta-python           /home/abdelk01/Work/qemu/meta-openembedded/meta-python  5
meta                  /home/abdelk01/Work/qemu/poky/meta        5
meta-poky             /home/abdelk01/Work/qemu/poky/meta-poky   5

bitbake-layers show-recipes | grep -A 1 python3-cryptography

python3-cryptography:
meta-python 36.0.1
python3-cryptography-vectors:
meta-python 36.0.1

Kind regards
________________________________
From: Tim Orling <[email protected]>
Sent: 04 March 2022 03:58
To: Alejandro Hernandez Samaniego <[email protected]>
Cc: Abdellatif El Khlifi <[email protected]>; Denys Dmytriyenko <[email protected]>; Drew Reed <[email protected]>; Jon Mason <[email protected]>; Maxim Uvarov <[email protected]>; Peter Griffin <[email protected]>; Sumit Garg <[email protected]>; Vishnu Banavath <[email protected]>; [email protected] <[email protected]>
Subject: Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16

On Thu, Mar 3, 2022 at 7:16 PM Alejandro Hernandez Samaniego <[email protected]<mailto:[email protected]>> wrote:

On 3/3/22 23:37, Denys Dmytriyenko wrote:

On Thu, Mar 03, 2022 at 09:11:28PM +0000, Alejandro Hernandez Samaniego wrote:

On 3/3/22 10:55, Abdellatif El Khlifi wrote:

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:

https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
https://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:

https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

I have suggested moving python3-cryptography (also python3-cryptography-vectors) to oe-core previously. It is heavily used for cryptography and needs to be kept up to date which is much more likely in oe-core.

This also means python3-pyo3, pyo3.bbclass, python3-setuptools-rust-native and the setuptools_rust.bbclass would also move to oe-core.

And then some tests. And documentation.

Alejandro

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3107): https://lists.yoctoproject.org/g/meta-arm/message/3107
Mute This Topic: https://lists.yoctoproject.org/mt/89404067/924729
Group Owner: [email protected]<mailto:meta-arm%[email protected]>
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]<mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-

#11 lore raw

I meant adding meta-python dependency to meta-arm layer like this:

In meta-arm/conf/layer.conf:

LAYERDEPENDS_meta-arm:append:qemuarm64-secureboot = " meta-python openembedded-layer"

It works as explained in the previous email.
________________________________
From: Abdellatif El Khlifi <[email protected]>
Sent: 04 March 2022 11:35
To: Tim Orling <[email protected]>; Alejandro Hernandez Samaniego <[email protected]>
Cc: Denys Dmytriyenko <[email protected]>; Drew Reed <[email protected]>; Jon Mason <[email protected]>; Maxim Uvarov <[email protected]>; Peter Griffin <[email protected]>; Sumit Garg <[email protected]>; Vishnu Banavath <[email protected]>; [email protected] <[email protected]>; Ross Burton <[email protected]>
Subject: Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16

Hi guys,

Thanks for the feedback.

Since the machine is in meta-arm (meta-arm/conf/machine/qemuarm64-secureboot.conf), it makes sense to add the meta-python layer dependency as detailed below.

It works, meta-python and python3-cryptography are detected. Please have a look at the logs below.

So, technically it works. But let's see what Jon and Ross think.

Suggested changes:

In ci/qemuarm64-secureboot.yml add:

- ci/meta-openembedded.yml

In meta-arm/conf/layer.conf add:

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

Before the changes:

bitbake-layers show-layers

NOTE: Starting bitbake server...
layer path priority
==========================================================================

meta-arm              /home/abdelk01/Work/qemu/meta-arm/meta-arm  5
meta-arm-bsp          /home/abdelk01/Work/qemu/meta-arm/meta-arm-bsp  5
meta-arm-toolchain    /home/abdelk01/Work/qemu/meta-arm/meta-arm-toolchain  5
meta                  /home/abdelk01/Work/qemu/poky/meta        5
meta-poky             /home/abdelk01/Work/qemu/poky/meta-poky   5

After the changes:

bitbake-layers show-layers

NOTE: Starting bitbake server...
layer path priority
==========================================================================

meta-arm              /home/abdelk01/Work/qemu/meta-arm/meta-arm  5
meta-arm-bsp          /home/abdelk01/Work/qemu/meta-arm/meta-arm-bsp  5
meta-arm-toolchain    /home/abdelk01/Work/qemu/meta-arm/meta-arm-toolchain  5
meta-filesystems      /home/abdelk01/Work/qemu/meta-openembedded/meta-filesystems  5
meta-networking       /home/abdelk01/Work/qemu/meta-openembedded/meta-networking  5
meta-oe               /home/abdelk01/Work/qemu/meta-openembedded/meta-oe  5
meta-python           /home/abdelk01/Work/qemu/meta-openembedded/meta-python  5
meta                  /home/abdelk01/Work/qemu/poky/meta        5
meta-poky             /home/abdelk01/Work/qemu/poky/meta-poky   5

bitbake-layers show-recipes | grep -A 1 python3-cryptography

python3-cryptography:
meta-python 36.0.1
python3-cryptography-vectors:
meta-python 36.0.1

Kind regards
________________________________
From: Tim Orling <[email protected]>
Sent: 04 March 2022 03:58
To: Alejandro Hernandez Samaniego <[email protected]>
Cc: Abdellatif El Khlifi <[email protected]>; Denys Dmytriyenko <[email protected]>; Drew Reed <[email protected]>; Jon Mason <[email protected]>; Maxim Uvarov <[email protected]>; Peter Griffin <[email protected]>; Sumit Garg <[email protected]>; Vishnu Banavath <[email protected]>; [email protected] <[email protected]>
Subject: Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16

On Thu, Mar 3, 2022 at 7:16 PM Alejandro Hernandez Samaniego <[email protected]<mailto:[email protected]>> wrote:

On 3/3/22 23:37, Denys Dmytriyenko wrote:

On Thu, Mar 03, 2022 at 09:11:28PM +0000, Alejandro Hernandez Samaniego wrote:

On 3/3/22 10:55, Abdellatif El Khlifi wrote:

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:

https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
https://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:

https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

I have suggested moving python3-cryptography (also python3-cryptography-vectors) to oe-core previously. It is heavily used for cryptography and needs to be kept up to date which is much more likely in oe-core.

This also means python3-pyo3, pyo3.bbclass, python3-setuptools-rust-native and the setuptools_rust.bbclass would also move to oe-core.

And then some tests. And documentation.

Alejandro

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3107): https://lists.yoctoproject.org/g/meta-arm/message/3107
Mute This Topic: https://lists.yoctoproject.org/mt/89404067/924729
Group Owner: [email protected]<mailto:meta-arm%[email protected]>
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]<mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-

#12 lore raw
Quoted 5 lines · Abdellatif El Khlifi

I meant adding meta-python dependency to meta-arm layer like this:

In meta-arm/conf/layer.conf:

LAYERDEPENDS_meta-arm:append:qemuarm64-secureboot = " meta-python openembedded-layer"

optee-os dependency on python3-cryptography is NOT specific to qemuarm64-secureboot!

Quoted 146 lines

It works as explained in the previous email.
________________________________
From: Abdellatif El Khlifi <[email protected]>
Sent: 04 March 2022 11:35
To: Tim Orling <[email protected]>; Alejandro Hernandez Samaniego <[email protected]>
Cc: Denys Dmytriyenko <[email protected]>; Drew Reed <[email protected]>; Jon Mason <[email protected]>; Maxim Uvarov <[email protected]>; Peter Griffin <[email protected]>; Sumit Garg <[email protected]>; Vishnu Banavath <[email protected]>; [email protected] <[email protected]>; Ross Burton <[email protected]>
Subject: Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16

Hi guys,

Thanks for the feedback.

Since the machine is in meta-arm (meta-arm/conf/machine/qemuarm64-secureboot.conf), it makes sense to add the meta-python layer dependency as detailed below.

It works, meta-python and python3-cryptography are detected. Please have a look at the logs below.

So, technically it works. But let's see what Jon and Ross think.

Suggested changes:

In ci/qemuarm64-secureboot.yml add:

- ci/meta-openembedded.yml

In meta-arm/conf/layer.conf add:

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

Before the changes:

bitbake-layers show-layers

NOTE: Starting bitbake server...
layer path priority
==========================================================================

meta-arm              /home/abdelk01/Work/qemu/meta-arm/meta-arm  5
meta-arm-bsp          /home/abdelk01/Work/qemu/meta-arm/meta-arm-bsp  5
meta-arm-toolchain    /home/abdelk01/Work/qemu/meta-arm/meta-arm-toolchain  5
meta                  /home/abdelk01/Work/qemu/poky/meta        5
meta-poky             /home/abdelk01/Work/qemu/poky/meta-poky   5

After the changes:

bitbake-layers show-layers

NOTE: Starting bitbake server...
layer path priority
==========================================================================

meta-arm              /home/abdelk01/Work/qemu/meta-arm/meta-arm  5
meta-arm-bsp          /home/abdelk01/Work/qemu/meta-arm/meta-arm-bsp  5
meta-arm-toolchain    /home/abdelk01/Work/qemu/meta-arm/meta-arm-toolchain  5
meta-filesystems      /home/abdelk01/Work/qemu/meta-openembedded/meta-filesystems  5
meta-networking       /home/abdelk01/Work/qemu/meta-openembedded/meta-networking  5
meta-oe               /home/abdelk01/Work/qemu/meta-openembedded/meta-oe  5
meta-python           /home/abdelk01/Work/qemu/meta-openembedded/meta-python  5
meta                  /home/abdelk01/Work/qemu/poky/meta        5
meta-poky             /home/abdelk01/Work/qemu/poky/meta-poky   5

bitbake-layers show-recipes | grep -A 1 python3-cryptography

python3-cryptography:
meta-python 36.0.1
python3-cryptography-vectors:
meta-python 36.0.1

Kind regards
________________________________
From: Tim Orling <[email protected]>
Sent: 04 March 2022 03:58
To: Alejandro Hernandez Samaniego <[email protected]>
Cc: Abdellatif El Khlifi <[email protected]>; Denys Dmytriyenko <[email protected]>; Drew Reed <[email protected]>; Jon Mason <[email protected]>; Maxim Uvarov <[email protected]>; Peter Griffin <[email protected]>; Sumit Garg <[email protected]>; Vishnu Banavath <[email protected]>; [email protected] <[email protected]>
Subject: Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16

On Thu, Mar 3, 2022 at 7:16 PM Alejandro Hernandez Samaniego <[email protected]<mailto:[email protected]>> wrote:

On 3/3/22 23:37, Denys Dmytriyenko wrote:

On Thu, Mar 03, 2022 at 09:11:28PM +0000, Alejandro Hernandez Samaniego wrote:

On 3/3/22 10:55, Abdellatif El Khlifi wrote:

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:

https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
https://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:

https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

I have suggested moving python3-cryptography (also python3-cryptography-vectors) to oe-core previously. It is heavily used for cryptography and needs to be kept up to date which is much more likely in oe-core.

This also means python3-pyo3, pyo3.bbclass, python3-setuptools-rust-native and the setuptools_rust.bbclass would also move to oe-core.

And then some tests. And documentation.

Alejandro

#13 lore raw
In reply to Alejandro Hernandez
Quoted 41 lines · Alejandro Hernandez
Quoted 30 lines · Denys Dmytriyenko
Quoted 16 lines · Alejandro Hernandez Samaniego
Quoted 8 lines · Abdellatif El Khlifi

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

Quoted 6 lines

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:

Quoted 8 lines

https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
https://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:

https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

Quoted 7 lines

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

This seems reasonable. Can you rework your series to add this? Also, we need to keep the older version of OPTEE for corstone1000 (for the kirkstone release). So, if you can keep that around in v2, it would be appreciated.

Thanks,
Jon

Quoted 2 lines

Alejandro

#14 lore raw
Quoted 45 lines · Jon Mason
Quoted 44 lines · Alejandro Hernandez
Quoted 29 lines · Denys Dmytriyenko
Quoted 15 lines · Alejandro Hernandez Samaniego
Quoted 8 lines · Abdellatif El Khlifi

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

Quoted 6 lines

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:

Quoted 8 lines

https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
https://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:

https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Quoted 8 lines
Quoted 1 line

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

This seems reasonable. Can you rework your series to add this? Also, we need to keep the older version of OPTEE for corstone1000 (for the kirkstone release). So, if you can keep that around in v2, it would be appreciated.

Thanks,
Jon

Will do, I'll send a v2 soon.

Cheers,

Alejandro

Quoted 10 lines
Quoted 10 lines

Alejandro

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3142):https://lists.yoctoproject.org/g/meta-arm/message/3142 Mute This Topic:https://lists.yoctoproject.org/mt/89404067/4354175
Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#15 lore raw
Quoted 6 lines · Alejandro Hernandez Samaniego

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Quoted 6 lines

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

This seems reasonable. Can you rework your series to add this? Also, we need to keep the older version of OPTEE for corstone1000 (for the kirkstone release). So, if you can keep that around in v2, it would be appreciated.

Sorry for being late to this thread, I've been elbow-deep in Python packaging changes.

As Tim said, moving python3-cryptography to meta-arm isn't one recipe:
it's two recipes and four or so classes. This isn't a trivial operation and I'm against that.

Can the use of python3-cryptography be a PACKAGECONFIG that is disabled in optee out of the box, so machines which want to use it can turn it on and add the dependency?

A less-worse option would be to DYNAMIC_LAYERS the optee recipes, so they're only parsed if meta-python is around.

Long term we definitely need to move the crypto stack to oe-core. I wonder if RP would be open to moving it now...

Ross

#16 lore raw
Quoted 26 lines · Ross Burton
Quoted 6 lines · Alejandro Hernandez Samaniego

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Quoted 6 lines

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

This seems reasonable. Can you rework your series to add this? Also, we need to keep the older version of OPTEE for corstone1000 (for the kirkstone release). So, if you can keep that around in v2, it would be appreciated.

Sorry for being late to this thread, I've been elbow-deep in Python packaging changes.

As Tim said, moving python3-cryptography to meta-arm isn't one recipe:
it's two recipes and four or so classes. This isn't a trivial operation and I'm against that.

Can the use of python3-cryptography be a PACKAGECONFIG that is disabled in optee out of the box, so machines which want to use it can turn it on and add the dependency?

Quoted 5 lines

A less-worse option would be to DYNAMIC_LAYERS the optee recipes, so they're only parsed if meta-python is around.

Long term we definitely need to move the crypto stack to oe-core. I wonder if RP would be open to moving it now...

I'm wondering how many classes/recipes are involved but I'm open to the idea...

Cheers,

Richard

#17 lore raw

From Tim earlier in the thread:

Quoted 2 lines

I have suggested moving python3-cryptography (also python3-cryptography-vectors) to oe-core previously. It is heavily used for cryptography and needs to be kept up to date which is much more likely in oe-core. This also means python3-pyo3, pyo3.bbclass, python3-setuptools-rust-native and the setuptools_rust.bbclass would also move to oe-core.

A few recipes and their ancillary classes.

Ross

Quoted 40 lines · Richard Purdie
Quoted 26 lines · Ross Burton
Quoted 6 lines · Alejandro Hernandez Samaniego

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Quoted 6 lines

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

This seems reasonable. Can you rework your series to add this? Also, we need to keep the older version of OPTEE for corstone1000 (for the kirkstone release). So, if you can keep that around in v2, it would be appreciated.

Sorry for being late to this thread, I've been elbow-deep in Python packaging changes.

As Tim said, moving python3-cryptography to meta-arm isn't one recipe:
it's two recipes and four or so classes. This isn't a trivial operation and I'm against that.

Can the use of python3-cryptography be a PACKAGECONFIG that is disabled in optee out of the box, so machines which want to use it can turn it on and add the dependency?

Quoted 5 lines

A less-worse option would be to DYNAMIC_LAYERS the optee recipes, so they're only parsed if meta-python is around.

Long term we definitely need to move the crypto stack to oe-core. I wonder if RP would be open to moving it now...

I'm wondering how many classes/recipes are involved but I'm open to the idea...

Cheers,

Richard

#18 lore raw
In reply to Alejandro Hernandez
Quoted 54 lines · Alejandro Hernandez
Quoted 51 lines · Jon Mason
Quoted 37 lines · Alejandro Hernandez
Quoted 36 lines · Denys Dmytriyenko
Quoted 15 lines · Alejandro Hernandez Samaniego
Quoted 8 lines · Abdellatif El Khlifi

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

Quoted 6 lines

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:

https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516ca
https://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:

Quoted 8 lines
Quoted 1 line

https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

This seems reasonable. Can you rework your series to add this? Also, we need to keep the older version of OPTEE for corstone1000 (for the kirkstone release). So, if you can keep that around in v2, it would be appreciated.

Quoted 7 lines
Quoted 2 lines

Thanks,
Jon

Will do, I'll send a v2 soon.
Cheers,
Alejandro

Quick update before sending v2, the list of required dependencies to bring python3-cryptography is the following:

recipes:

python3-asn1crypto_1.4.0.bb
python3-cffi_1.15.0.bb
python3-cryptography
python3-cryptography_36.0.1.bb
python3-cryptography-vectors_36.0.1.bb
python3-pycparser_2.21.bb
python3-semantic-version_2.9.0.bb
python3-setuptools-rust-native_1.1.2.bb
python3-typing-extensions_3.10.0.0.bb

classes:

pyo3.bbclass
setuptools3_rust.bbclass

Alejandro

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

Alejandro

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3142):https://lists.yoctoproject.org/g/meta-arm/message/3142 Mute This Topic:https://lists.yoctoproject.org/mt/89404067/4354175
Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#19 lore raw
Quoted 76 lines · Alejandro Hernandez Samaniego

On 3/10/22 01:05, Alejandro Hernandez wrote:

On 3/9/22 13:01, Jon Mason wrote:

On Fri, Mar 04, 2022 at 03:16:31AM +0000, Alejandro Hernandez wrote:

On 3/3/22 23:37, Denys Dmytriyenko wrote:

On Thu, Mar 03, 2022 at 09:11:28PM +0000, Alejandro Hernandez Samaniego wrote:

On 3/3/22 10:55, Abdellatif El Khlifi wrote:

Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot = " meta-python openembedded-layer"

This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.

Moreover, optee is used by other BSP layers (e.g. meta-ti) by depending on meta-arm, not meta-arm-bsp.

Depending on python3-cryptography which is only available in meta-python (part of meta-openembedded) should be avoided. Back in the day we pushed for moving other python3 dependencies like pycryptodome and pyelftools into OE-Core:
https://git.openembedded.org/meta-openembedded/commit/?id=a8f3c00d8d113b46a49584682e10435157d516cahttps://git.yoctoproject.org/meta-arm/commit/?id=f2069723f27d9229e8ec74263a41160c8df32571

We could try doing the same with this new python3-cryptography dependecy and propose moving it to OE-Core. Alternatively, consider adding it to meta-arm? Not ideal, but meta-arm-bsp briefly carried alternative/older version recently:
https://git.yoctoproject.org/meta-arm/commit/?id=a15c16068ab011e2ba91a6c4ca6e1251de0d8058

I agree with Denys's point here, I think its likely there's other cases just like meta-ti, and we would be forcing a meta-oe and meta-python dependency on them, IMO it would make sense to add a copy of python3-cryptography to meta-arm (especially since there's been similar situations in the past) and in parallel try to make a case for python3-cryptography to be moved from meta-python to OE-core.

Once (and if) we're successful we can delete the python3-cyrptography copy from meta-arm.

This seems reasonable. Can you rework your series to add this? Also, we need to keep the older version of OPTEE for corstone1000 (for the kirkstone release). So, if you can keep that around in v2, it would be appreciated.

Thanks,
Jon

Will do, I'll send a v2 soon.

Cheers,

Alejandro

Quick update before sending v2, the list of required dependencies to bring python3-cryptography is the following:

recipes:

Quoted 9 lines

python3-asn1crypto_1.4.0.bbpython3-cffi_1.15.0.bb python3-cryptographypython3-cryptography_36.0.1.bbpython3-cryptography-vectors_36.0.1.bbpython3-pycparser_2.21.bbpython3-semantic-version_2.9.0.bbpython3-setuptools-rust-native_1.1.2.bbpython3-typing-extensions_3.10.0.0.bb

classes:

pyo3.bbclass
setuptools3_rust.bbclass

The full story (only missing a couple recipes added to ptest because I don’t know if they are slow or fast)
https://git.yoctoproject.org/poky-contrib/log/?h=timo/move-py-crypto

—Tim

Quoted 19 lines

Alejandro

Alejandro

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#3150):
https://lists.yoctoproject.org/g/meta-arm/message/3150
Mute This Topic: https://lists.yoctoproject.org/mt/89404067/924729
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#21 lore raw
In reply to a message not in the archive

Thanks Tim and Richard!, I'll send a v2 soon based off on those changes.

Cheers,

Alejandro

Quoted 43 lines · Richard Purdie
Quoted 19 lines · Tim Orling
Quoted 7 lines · Alejandro Hernandez Samaniego

Quick update before sending v2, the list of required dependencies to bring python3-cryptography is the following:
recipes:
python3-asn1crypto_1.4.0.bb
python3-cffi_1.15.0.bb
python3-cryptography
python3-cryptography_36.0.1.bb

Quoted 9 lines

python3-cryptography-vectors_36.0.1.bb
python3-pycparser_2.21.bb
python3-semantic-version_2.9.0.bb
python3-setuptools-rust-native_1.1.2.bb
python3-typing-extensions_3.10.0.0.bb
classes:
pyo3.bbclass
setuptools3_rust.bbclass

Quoted 3 lines

The full story (only missing a couple recipes added to ptest because I don’t know if they are slow or fast)
https://git.yoctoproject.org/poky-contrib/log/?h=timo/move-py-crypto

I've tweaked the series a bit and it is now in master-next.

I've renamed the classes to add a python_ prefix which will mean we need to tweak recipes a little but I think it is the right thing to do and best done now rather than any later.

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#3168):https://lists.yoctoproject.org/g/meta-arm/message/3168 Mute This Topic:https://lists.yoctoproject.org/mt/89404067/4354175
Group Owner:[email protected] Unsubscribe:https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Applied
#22 lore raw
In reply to Alejandro Enedino Hernandez Samaniego
Quoted 6 lines · Alejandro Enedino Hernandez Samaniego

- Removes upstreamed patches for optee-examples
- Fixes optee-examples installation
- Includes new python3-cryptography dependency
- Fixes python3-cryptography to work with openssl

Tested on qemuarm64-secureboot via optee-examples xtest -l 15

Applied, thanks!

[1/1] arm/optee: Upgrade from 3.14 to 3.16

      commit: 3d0e5368d17fac053227422e4f4fddbc1fa7c7de

Best regards,

Signature · 1 line
Jon Mason <[email protected]>