* [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components
@ 2020-04-01 23:13 Denys Dmytriyenko
2020-04-01 23:13 ` [PATCH 2/5] optee-os: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
` (5 more replies)
0 siblings, 6 replies; 18+ messages in thread
From: Denys Dmytriyenko @ 2020-04-01 23:13 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
optee components use pycrypto, pycryptodomex and pyelftools from meta-python layer
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arm/conf/layer.conf | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf
index 0b93e8d..d96e9f1 100644
--- a/meta-arm/conf/layer.conf
+++ b/meta-arm/conf/layer.conf
@@ -9,5 +9,8 @@ BBFILE_COLLECTIONS += "meta-arm"
BBFILE_PATTERN_meta-arm = "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-arm = "6"
-LAYERDEPENDS_meta-arm = "core"
+LAYERDEPENDS_meta-arm = " \
+ core \
+ meta-python \
+"
LAYERSERIES_COMPAT_meta-arm = "warrior zeus dunfell"
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/5] optee-os: upgrade 3.7.0 -> 3.8.0, cleanup
2020-04-01 23:13 [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Denys Dmytriyenko
@ 2020-04-01 23:13 ` Denys Dmytriyenko
2020-04-02 7:20 ` [meta-arm] " Diego Sueiro
2020-04-01 23:13 ` [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup Denys Dmytriyenko
` (4 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Denys Dmytriyenko @ 2020-04-01 23:13 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
* Cleanup the recipe - add HOMEPAGE, update DESCRIPTION, indentation
* Depend on PyCryptodomex, but old PyCrypto is still required
* Ensure full support for arm32 platforms - build corresponding core and TA
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arm/recipes-security/optee/optee-os_git.bb | 63 ++++++++++++++-----------
1 file changed, 36 insertions(+), 27 deletions(-)
diff --git a/meta-arm/recipes-security/optee/optee-os_git.bb b/meta-arm/recipes-security/optee/optee-os_git.bb
index 872fd48..47ced12 100644
--- a/meta-arm/recipes-security/optee/optee-os_git.bb
+++ b/meta-arm/recipes-security/optee/optee-os_git.bb
@@ -1,52 +1,63 @@
SUMMARY = "OP-TEE Trusted OS"
-DESCRIPTION = "OPTEE OS"
+DESCRIPTION = "Open Portable Trusted Execution Environment - Trusted side of the TEE"
+HOMEPAGE = "https://www.op-tee.org/"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
-PV="3.7.0+git${SRCPV}"
+PV = "3.8.0+git${SRCPV}"
inherit deploy python3native
-DEPENDS = "python3-pycrypto-native python3-pyelftools-native"
+DEPENDS = "python3-pycrypto-native python3-pyelftools-native python3-pycryptodomex-native"
-SRCREV = "a2fa5018cb595a9cd9ab62e82c7485ca57a62084"
-SRC_URI = "git://github.com/OP-TEE/optee_os.git \
- file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
- "
+SRCREV = "023e33656e2c9557ce50ad63a98b2e2c9b51c118"
+SRC_URI = " \
+ git://github.com/OP-TEE/optee_os.git \
+ file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
+"
S = "${WORKDIR}/git"
OPTEEMACHINE ?= "${MACHINE}"
OPTEEOUTPUTMACHINE ?= "${MACHINE}"
-EXTRA_OEMAKE = "PLATFORM=${OPTEEMACHINE} CFG_ARM64_core=y \
- CROSS_COMPILE_core=${HOST_PREFIX} \
- CROSS_COMPILE_ta_arm64=${HOST_PREFIX} \
- NOWERROR=1 \
- ta-targets=ta_arm64 \
- LDFLAGS= \
- LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \
- "
-
OPTEE_ARCH_armv7a = "arm32"
OPTEE_ARCH_aarch64 = "arm64"
+OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
+
+EXTRA_OEMAKE = " \
+ PLATFORM=${OPTEEMACHINE} \
+ CFG_${OPTEE_CORE}_core=y \
+ CROSS_COMPILE_core=${HOST_PREFIX} \
+ CROSS_COMPILE_ta_${OPTEE_ARCH}=${HOST_PREFIX} \
+ NOWERROR=1 \
+ V=1 \
+ ta-targets=ta_${OPTEE_ARCH} \
+ LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \
+"
+
+CFLAGS[unexport] = "1"
+LDFLAGS[unexport] = "1"
+CPPFLAGS[unexport] = "1"
+AS[unexport] = "1"
+LD[unexport] = "1"
+
+do_configure[noexec] = "1"
do_compile() {
- unset LDFLAGS
oe_runmake all CFG_TEE_TA_LOG_LEVEL=0
}
do_install() {
- #install core on boot directory
+ #install core in firmware
install -d ${D}${nonarch_base_libdir}/firmware/
-
install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
- #install TA devkit
- install -d ${D}/usr/include/optee/export-user_ta/
- for f in ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/export-ta_${OPTEE_ARCH}/* ; do
- cp -aR $f ${D}/usr/include/optee/export-user_ta/
+ #install TA devkit
+ install -d ${D}${includedir}/optee/export-user_ta/
+ for f in ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/export-ta_${OPTEE_ARCH}/* ; do
+ cp -aR $f ${D}${includedir}/optee/export-user_ta/
done
}
@@ -54,15 +65,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
do_deploy() {
install -d ${DEPLOYDIR}/optee
- for f in ${D}${nonarch_base_libdir}/firmware/*; do
- install -m 644 $f ${DEPLOYDIR}/optee/
- done
+ install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/optee/
}
addtask deploy before do_build after do_install
FILES_${PN} = "${nonarch_base_libdir}/firmware/"
-FILES_${PN}-dev = "/usr/include/optee"
+FILES_${PN}-dev = "${includedir}/optee/"
INSANE_SKIP_${PN}-dev = "staticdev"
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup
2020-04-01 23:13 [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Denys Dmytriyenko
2020-04-01 23:13 ` [PATCH 2/5] optee-os: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
@ 2020-04-01 23:13 ` Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
2020-04-02 10:01 ` Peter Griffin
2020-04-01 23:13 ` [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
` (3 subsequent siblings)
5 siblings, 2 replies; 18+ messages in thread
From: Denys Dmytriyenko @ 2020-04-01 23:13 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
* Rename with _git suffix to match other optee recipes
* Add DESCRIPTION
* Use common HOMEPAGE
* Use install command for header files instead of cp -a
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../optee/{optee-client.bb => optee-client_git.bb} | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
rename meta-arm/recipes-security/optee/{optee-client.bb => optee-client_git.bb} (63%)
diff --git a/meta-arm/recipes-security/optee/optee-client.bb b/meta-arm/recipes-security/optee/optee-client_git.bb
similarity index 63%
rename from meta-arm/recipes-security/optee/optee-client.bb
rename to meta-arm/recipes-security/optee/optee-client_git.bb
index 519683a..a25d343 100644
--- a/meta-arm/recipes-security/optee/optee-client.bb
+++ b/meta-arm/recipes-security/optee/optee-client_git.bb
@@ -1,18 +1,21 @@
-SUMMARY = "OPTEE Client"
-HOMEPAGE = "https://github.com/OP-TEE/optee_client"
+SUMMARY = "OP-TEE Client API"
+DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World Client side of the TEE"
+HOMEPAGE = "https://www.op-tee.org/"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
-PV = "3.7.0+git${SRCPV}"
+PV = "3.8.0+git${SRCPV}"
inherit python3native systemd
-SRC_URI = "git://github.com/OP-TEE/optee_client.git \
- file://tee-supplicant.service"
-S = "${WORKDIR}/git"
+SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
+SRC_URI = " \
+ git://github.com/OP-TEE/optee_client.git \
+ file://tee-supplicant.service \
+"
-SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
+S = "${WORKDIR}/git"
SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
@@ -25,7 +28,8 @@ do_install() {
ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
- cp -a ${S}/out/export/usr/include ${D}/usr/
+ install -d ${D}${includedir}
+ install -p -m0644 ${S}/out/export/usr/include/*.h ${D}${includedir}
sed -i -e s:/etc:${sysconfdir}:g \
-e s:/usr/bin:${bindir}:g \
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup
2020-04-01 23:13 [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Denys Dmytriyenko
2020-04-01 23:13 ` [PATCH 2/5] optee-os: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
2020-04-01 23:13 ` [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup Denys Dmytriyenko
@ 2020-04-01 23:13 ` Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
2020-04-02 10:02 ` Peter Griffin
2020-04-01 23:13 ` [PATCH 5/5] optee-examples: cleanup Denys Dmytriyenko
` (2 subsequent siblings)
5 siblings, 2 replies; 18+ messages in thread
From: Denys Dmytriyenko @ 2020-04-01 23:13 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
* Drop previously backported patch for Python3 support
* Add DESCRIPTION
* Use common HOMEPAGE
* Depend on PyCryptodomex instead of old PyCrypto
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../0001-use-python3-instead-of-python.patch | 48 ----------------------
meta-arm/recipes-security/optee/optee-test_git.bb | 15 ++++---
2 files changed, 7 insertions(+), 56 deletions(-)
delete mode 100644 meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch
diff --git a/meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch b/meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch
deleted file mode 100644
index 20f190a..0000000
--- a/meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 6271160639002a2580d80b75b5397a96d56329f2 Mon Sep 17 00:00:00 2001
-From: Scott Branden <scott.branden@broadcom.com>
-Date: Fri, 27 Dec 2019 12:54:28 -0800
-Subject: [PATCH] use python3 instead of python
-
-use python3 instead of python as python2 is EOL January 2020.
-
-Signed-off-by: Scott Branden <scott.branden@broadcom.com>
-Reviewed-by: Jerome Forissier <jerome@forissier.org>
-Tested-by: Jerome Forissier <jerome@forissier.org> (QEMU, CFG_GCM_NIST_VECTORS=y)
-Upstream-Status: Backport from v3.8.0
----
- scripts/file_to_c.py | 4 ++--
- scripts/rsp_to_gcm_test.py | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py
-index ae16f52..b4ce2a2 100755
---- a/scripts/file_to_c.py
-+++ b/scripts/file_to_c.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # SPDX-License-Identifier: BSD-2-Clause
- #
- # Copyright (c) 2018, Linaro Limited
-@@ -29,7 +29,7 @@ def main():
-
- f.write("const uint8_t " + args.name + "[] = {\n")
- i = 0
-- for x in array.array("B", inf.read()):
-+ for x in array.array("B", map(ord, (inf.read()))):
- f.write("0x" + '{0:02x}'.format(x) + ",")
- i = i + 1
- if i % 8 == 0:
-diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py
-index 0543541..e4418be 100755
---- a/scripts/rsp_to_gcm_test.py
-+++ b/scripts/rsp_to_gcm_test.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- modes = {'encrypt': 0, 'decrypt': 1}
-
---
-2.7.4
-
diff --git a/meta-arm/recipes-security/optee/optee-test_git.bb b/meta-arm/recipes-security/optee/optee-test_git.bb
index 3f431c3..752d75d 100644
--- a/meta-arm/recipes-security/optee/optee-test_git.bb
+++ b/meta-arm/recipes-security/optee/optee-test_git.bb
@@ -1,21 +1,20 @@
SUMMARY = "OP-TEE sanity testsuite"
-HOMEPAGE = "https://github.com/OP-TEE/optee_test"
+DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
+HOMEPAGE = "https://www.op-tee.org/"
LICENSE = "BSD & GPLv2"
LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
inherit python3native
-DEPENDS = "optee-client optee-os python3-pycrypto-native"
+DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
-PV = "3.7.0+git${SRCPV}"
+PV = "3.8.0+git${SRCPV}"
-SRC_URI = "git://github.com/OP-TEE/optee_test.git \
- file://0001-use-python3-instead-of-python.patch \
- "
-S = "${WORKDIR}/git"
+SRCREV = "30481e381cb4285706e7516853495a7699c93b2c"
+SRC_URI = "git://github.com/OP-TEE/optee_test.git"
-SRCREV = "227d6f4c40eaa6f84fe049b9e48c7b27ad7fab08"
+S = "${WORKDIR}/git"
OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}"
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/5] optee-examples: cleanup
2020-04-01 23:13 [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Denys Dmytriyenko
` (2 preceding siblings ...)
2020-04-01 23:13 ` [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
@ 2020-04-01 23:13 ` Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
2020-04-02 9:57 ` Peter Griffin
2020-04-02 7:19 ` [meta-arm] [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Diego Sueiro
2020-04-02 9:59 ` Peter Griffin
5 siblings, 2 replies; 18+ messages in thread
From: Denys Dmytriyenko @ 2020-04-01 23:13 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
* Rename with _git suffix to match other optee recipes
* Set PV
* Add DESCRIPTION
* Depend on Python3 version of PyCryptodomex instead of Python2 version of PyCrypto
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../optee/{optee-examples.bb => optee-examples_git.bb} | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
rename meta-arm/recipes-security/optee/{optee-examples.bb => optee-examples_git.bb} (87%)
diff --git a/meta-arm/recipes-security/optee/optee-examples.bb b/meta-arm/recipes-security/optee/optee-examples_git.bb
similarity index 87%
rename from meta-arm/recipes-security/optee/optee-examples.bb
rename to meta-arm/recipes-security/optee/optee-examples_git.bb
index aaec4c4..768a55b 100644
--- a/meta-arm/recipes-security/optee/optee-examples.bb
+++ b/meta-arm/recipes-security/optee/optee-examples_git.bb
@@ -1,10 +1,13 @@
SUMMARY = "OP-TEE examples"
+DESCRIPTION = "Open Portable Trusted Execution Environment - Sample Applications"
HOMEPAGE = "https://github.com/linaro-swg/optee_examples"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
-DEPENDS = "optee-client optee-os python-pycrypto-native"
+PV = "3.8.0+git${SRCPV}"
+
+DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
inherit python3native
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components
2020-04-01 23:13 [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Denys Dmytriyenko
` (3 preceding siblings ...)
2020-04-01 23:13 ` [PATCH 5/5] optee-examples: cleanup Denys Dmytriyenko
@ 2020-04-02 7:19 ` Diego Sueiro
2020-04-02 9:59 ` Peter Griffin
5 siblings, 0 replies; 18+ messages in thread
From: Diego Sueiro @ 2020-04-02 7:19 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko, nd
> -----Original Message-----
> From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> On Behalf Of Denys Dmytriyenko via lists.yoctoproject.org
> Sent: 02 April 2020 00:13
> To: meta-arm@lists.yoctoproject.org
> Cc: Denys Dmytriyenko <denys@ti.com>
> Subject: [meta-arm] [PATCH 1/5] layer.conf: add meta-python to
> LAYERDEPENDS for optee components
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> optee components use pycrypto, pycryptodomex and pyelftools from meta-
> python layer
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
> ---
> meta-arm/conf/layer.conf | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf index
> 0b93e8d..d96e9f1 100644
> --- a/meta-arm/conf/layer.conf
> +++ b/meta-arm/conf/layer.conf
> @@ -9,5 +9,8 @@ BBFILE_COLLECTIONS += "meta-arm"
> BBFILE_PATTERN_meta-arm = "^${LAYERDIR}/"
> BBFILE_PRIORITY_meta-arm = "6"
>
> -LAYERDEPENDS_meta-arm = "core"
> +LAYERDEPENDS_meta-arm = " \
> + core \
> + meta-python \
> +"
> LAYERSERIES_COMPAT_meta-arm = "warrior zeus dunfell"
> --
> 2.7.4
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 2/5] optee-os: upgrade 3.7.0 -> 3.8.0, cleanup
2020-04-01 23:13 ` [PATCH 2/5] optee-os: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
@ 2020-04-02 7:20 ` Diego Sueiro
0 siblings, 0 replies; 18+ messages in thread
From: Diego Sueiro @ 2020-04-02 7:20 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko, nd
> -----Original Message-----
> From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> On Behalf Of Denys Dmytriyenko via lists.yoctoproject.org
> Sent: 02 April 2020 00:13
> To: meta-arm@lists.yoctoproject.org
> Cc: Denys Dmytriyenko <denys@ti.com>
> Subject: [meta-arm] [PATCH 2/5] optee-os: upgrade 3.7.0 -> 3.8.0, cleanup
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Cleanup the recipe - add HOMEPAGE, update DESCRIPTION, indentation
> * Depend on PyCryptodomex, but old PyCrypto is still required
> * Ensure full support for arm32 platforms - build corresponding core and TA
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
> ---
> meta-arm/recipes-security/optee/optee-os_git.bb | 63 ++++++++++++++-------
> ----
> 1 file changed, 36 insertions(+), 27 deletions(-)
>
> diff --git a/meta-arm/recipes-security/optee/optee-os_git.bb b/meta-
> arm/recipes-security/optee/optee-os_git.bb
> index 872fd48..47ced12 100644
> --- a/meta-arm/recipes-security/optee/optee-os_git.bb
> +++ b/meta-arm/recipes-security/optee/optee-os_git.bb
> @@ -1,52 +1,63 @@
> SUMMARY = "OP-TEE Trusted OS"
> -DESCRIPTION = "OPTEE OS"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Trusted side
> of the TEE"
> +HOMEPAGE = "https://www.op-tee.org/"
>
> LICENSE = "BSD"
> LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
>
> -PV="3.7.0+git${SRCPV}"
> +PV = "3.8.0+git${SRCPV}"
>
> inherit deploy python3native
>
> -DEPENDS = "python3-pycrypto-native python3-pyelftools-native"
> +DEPENDS = "python3-pycrypto-native python3-pyelftools-native python3-
> pycryptodomex-native"
>
> -SRCREV = "a2fa5018cb595a9cd9ab62e82c7485ca57a62084"
> -SRC_URI = "git://github.com/OP-TEE/optee_os.git \
> - file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
> - "
> +SRCREV = "023e33656e2c9557ce50ad63a98b2e2c9b51c118"
> +SRC_URI = " \
> + git://github.com/OP-TEE/optee_os.git \
> + file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ "
>
> S = "${WORKDIR}/git"
>
> OPTEEMACHINE ?= "${MACHINE}"
> OPTEEOUTPUTMACHINE ?= "${MACHINE}"
>
> -EXTRA_OEMAKE = "PLATFORM=${OPTEEMACHINE} CFG_ARM64_core=y \
> - CROSS_COMPILE_core=${HOST_PREFIX} \
> - CROSS_COMPILE_ta_arm64=${HOST_PREFIX} \
> - NOWERROR=1 \
> - ta-targets=ta_arm64 \
> - LDFLAGS= \
> - LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \
> - "
> -
> OPTEE_ARCH_armv7a = "arm32"
> OPTEE_ARCH_aarch64 = "arm64"
> +OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
> +
> +EXTRA_OEMAKE = " \
> + PLATFORM=${OPTEEMACHINE} \
> + CFG_${OPTEE_CORE}_core=y \
> + CROSS_COMPILE_core=${HOST_PREFIX} \
> + CROSS_COMPILE_ta_${OPTEE_ARCH}=${HOST_PREFIX} \
> + NOWERROR=1 \
> + V=1 \
> + ta-targets=ta_${OPTEE_ARCH} \
> + LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \ "
> +
> +CFLAGS[unexport] = "1"
> +LDFLAGS[unexport] = "1"
> +CPPFLAGS[unexport] = "1"
> +AS[unexport] = "1"
> +LD[unexport] = "1"
> +
> +do_configure[noexec] = "1"
>
> do_compile() {
> - unset LDFLAGS
> oe_runmake all CFG_TEE_TA_LOG_LEVEL=0 }
>
> do_install() {
> - #install core on boot directory
> + #install core in firmware
> install -d ${D}${nonarch_base_libdir}/firmware/
> -
> install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/*.bin
> ${D}${nonarch_base_libdir}/firmware/
> - #install TA devkit
> - install -d ${D}/usr/include/optee/export-user_ta/
>
> - for f in ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/export-
> ta_${OPTEE_ARCH}/* ; do
> - cp -aR $f ${D}/usr/include/optee/export-user_ta/
> + #install TA devkit
> + install -d ${D}${includedir}/optee/export-user_ta/
> + for f in ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/export-
> ta_${OPTEE_ARCH}/* ; do
> + cp -aR $f ${D}${includedir}/optee/export-user_ta/
> done
> }
>
> @@ -54,15 +65,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> do_deploy() {
> install -d ${DEPLOYDIR}/optee
> - for f in ${D}${nonarch_base_libdir}/firmware/*; do
> - install -m 644 $f ${DEPLOYDIR}/optee/
> - done
> + install -m 644 ${D}${nonarch_base_libdir}/firmware/*
> + ${DEPLOYDIR}/optee/
> }
>
> addtask deploy before do_build after do_install
>
> FILES_${PN} = "${nonarch_base_libdir}/firmware/"
> -FILES_${PN}-dev = "/usr/include/optee"
> +FILES_${PN}-dev = "${includedir}/optee/"
>
> INSANE_SKIP_${PN}-dev = "staticdev"
>
> --
> 2.7.4
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup
2020-04-01 23:13 ` [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup Denys Dmytriyenko
@ 2020-04-02 7:21 ` Diego Sueiro
2020-04-02 10:01 ` Peter Griffin
1 sibling, 0 replies; 18+ messages in thread
From: Diego Sueiro @ 2020-04-02 7:21 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko, nd
> -----Original Message-----
> From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> On Behalf Of Denys Dmytriyenko via lists.yoctoproject.org
> Sent: 02 April 2020 00:13
> To: meta-arm@lists.yoctoproject.org
> Cc: Denys Dmytriyenko <denys@ti.com>
> Subject: [meta-arm] [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Rename with _git suffix to match other optee recipes
> * Add DESCRIPTION
> * Use common HOMEPAGE
> * Use install command for header files instead of cp -a
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
> ---
> .../optee/{optee-client.bb => optee-client_git.bb} | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-) rename meta-arm/recipes-
> security/optee/{optee-client.bb => optee-client_git.bb} (63%)
>
> diff --git a/meta-arm/recipes-security/optee/optee-client.bb b/meta-
> arm/recipes-security/optee/optee-client_git.bb
> similarity index 63%
> rename from meta-arm/recipes-security/optee/optee-client.bb
> rename to meta-arm/recipes-security/optee/optee-client_git.bb
> index 519683a..a25d343 100644
> --- a/meta-arm/recipes-security/optee/optee-client.bb
> +++ b/meta-arm/recipes-security/optee/optee-client_git.bb
> @@ -1,18 +1,21 @@
> -SUMMARY = "OPTEE Client"
> -HOMEPAGE = "https://github.com/OP-TEE/optee_client"
> +SUMMARY = "OP-TEE Client API"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Normal
> World Client side of the TEE"
> +HOMEPAGE = "https://www.op-tee.org/"
>
> LICENSE = "BSD"
> LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
>
> -PV = "3.7.0+git${SRCPV}"
> +PV = "3.8.0+git${SRCPV}"
>
> inherit python3native systemd
>
> -SRC_URI = "git://github.com/OP-TEE/optee_client.git \
> - file://tee-supplicant.service"
> -S = "${WORKDIR}/git"
> +SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
> +SRC_URI = " \
> + git://github.com/OP-TEE/optee_client.git \
> + file://tee-supplicant.service \
> +"
>
> -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
> +S = "${WORKDIR}/git"
>
> SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
>
> @@ -25,7 +28,8 @@ do_install() {
> ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
> ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
>
> - cp -a ${S}/out/export/usr/include ${D}/usr/
> + install -d ${D}${includedir}
> + install -p -m0644 ${S}/out/export/usr/include/*.h ${D}${includedir}
>
> sed -i -e s:/etc:${sysconfdir}:g \
> -e s:/usr/bin:${bindir}:g \
> --
> 2.7.4
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup
2020-04-01 23:13 ` [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
@ 2020-04-02 7:21 ` Diego Sueiro
2020-04-02 10:02 ` Peter Griffin
1 sibling, 0 replies; 18+ messages in thread
From: Diego Sueiro @ 2020-04-02 7:21 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko, nd
> -----Original Message-----
> From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> On Behalf Of Denys Dmytriyenko via lists.yoctoproject.org
> Sent: 02 April 2020 00:13
> To: meta-arm@lists.yoctoproject.org
> Cc: Denys Dmytriyenko <denys@ti.com>
> Subject: [meta-arm] [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Drop previously backported patch for Python3 support
> * Add DESCRIPTION
> * Use common HOMEPAGE
> * Depend on PyCryptodomex instead of old PyCrypto
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>
> ---
> .../0001-use-python3-instead-of-python.patch | 48 ----------------------
> meta-arm/recipes-security/optee/optee-test_git.bb | 15 ++++---
> 2 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 meta-
> arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-
> python.patch
>
> diff --git a/meta-arm/recipes-security/optee/optee-test/0001-use-python3-
> instead-of-python.patch b/meta-arm/recipes-security/optee/optee-
> test/0001-use-python3-instead-of-python.patch
> deleted file mode 100644
> index 20f190a..0000000
> --- a/meta-arm/recipes-security/optee/optee-test/0001-use-python3-
> instead-of-python.patch
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -From 6271160639002a2580d80b75b5397a96d56329f2 Mon Sep 17 00:00:00
> 2001
> -From: Scott Branden <scott.branden@broadcom.com>
> -Date: Fri, 27 Dec 2019 12:54:28 -0800
> -Subject: [PATCH] use python3 instead of python
> -
> -use python3 instead of python as python2 is EOL January 2020.
> -
> -Signed-off-by: Scott Branden <scott.branden@broadcom.com>
> -Reviewed-by: Jerome Forissier <jerome@forissier.org>
> -Tested-by: Jerome Forissier <jerome@forissier.org> (QEMU,
> CFG_GCM_NIST_VECTORS=y)
> -Upstream-Status: Backport from v3.8.0
> ----
> - scripts/file_to_c.py | 4 ++--
> - scripts/rsp_to_gcm_test.py | 2 +-
> - 2 files changed, 3 insertions(+), 3 deletions(-)
> -
> -diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py -index
> ae16f52..b4ce2a2 100755
> ---- a/scripts/file_to_c.py
> -+++ b/scripts/file_to_c.py
> -@@ -1,4 +1,4 @@
> --#!/usr/bin/env python
> -+#!/usr/bin/env python3
> - # SPDX-License-Identifier: BSD-2-Clause
> - #
> - # Copyright (c) 2018, Linaro Limited
> -@@ -29,7 +29,7 @@ def main():
> -
> - f.write("const uint8_t " + args.name + "[] = {\n")
> - i = 0
> -- for x in array.array("B", inf.read()):
> -+ for x in array.array("B", map(ord, (inf.read()))):
> - f.write("0x" + '{0:02x}'.format(x) + ",")
> - i = i + 1
> - if i % 8 == 0:
> -diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py -index
> 0543541..e4418be 100755
> ---- a/scripts/rsp_to_gcm_test.py
> -+++ b/scripts/rsp_to_gcm_test.py
> -@@ -1,4 +1,4 @@
> --#!/usr/bin/env python
> -+#!/usr/bin/env python3
> -
> - modes = {'encrypt': 0, 'decrypt': 1}
> -
> ---
> -2.7.4
> -
> diff --git a/meta-arm/recipes-security/optee/optee-test_git.bb b/meta-
> arm/recipes-security/optee/optee-test_git.bb
> index 3f431c3..752d75d 100644
> --- a/meta-arm/recipes-security/optee/optee-test_git.bb
> +++ b/meta-arm/recipes-security/optee/optee-test_git.bb
> @@ -1,21 +1,20 @@
> SUMMARY = "OP-TEE sanity testsuite"
> -HOMEPAGE = "https://github.com/OP-TEE/optee_test"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
> +HOMEPAGE = "https://www.op-tee.org/"
>
> LICENSE = "BSD & GPLv2"
> LIC_FILES_CHKSUM =
> "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
>
> inherit python3native
>
> -DEPENDS = "optee-client optee-os python3-pycrypto-native"
> +DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
>
> -PV = "3.7.0+git${SRCPV}"
> +PV = "3.8.0+git${SRCPV}"
>
> -SRC_URI = "git://github.com/OP-TEE/optee_test.git \
> - file://0001-use-python3-instead-of-python.patch \
> - "
> -S = "${WORKDIR}/git"
> +SRCREV = "30481e381cb4285706e7516853495a7699c93b2c"
> +SRC_URI = "git://github.com/OP-TEE/optee_test.git"
>
> -SRCREV = "227d6f4c40eaa6f84fe049b9e48c7b27ad7fab08"
> +S = "${WORKDIR}/git"
>
> OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
> TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}"
> --
> 2.7.4
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 5/5] optee-examples: cleanup
2020-04-01 23:13 ` [PATCH 5/5] optee-examples: cleanup Denys Dmytriyenko
@ 2020-04-02 7:21 ` Diego Sueiro
2020-04-02 16:27 ` Denys Dmytriyenko
2020-04-02 9:57 ` Peter Griffin
1 sibling, 1 reply; 18+ messages in thread
From: Diego Sueiro @ 2020-04-02 7:21 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko, nd
> -----Original Message-----
> From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> On Behalf Of Denys Dmytriyenko via lists.yoctoproject.org
> Sent: 02 April 2020 00:13
> To: meta-arm@lists.yoctoproject.org
> Cc: Denys Dmytriyenko <denys@ti.com>
> Subject: [meta-arm] [PATCH 5/5] optee-examples: cleanup
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Rename with _git suffix to match other optee recipes
> * Set PV
> * Add DESCRIPTION
> * Depend on Python3 version of PyCryptodomex instead of Python2 version
> of PyCrypto
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Can we take this opportunity to upgrade this recipe to 3.8.0 as well?
> ---
> .../optee/{optee-examples.bb => optee-examples_git.bb} | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-) rename meta-arm/recipes-
> security/optee/{optee-examples.bb => optee-examples_git.bb} (87%)
>
> diff --git a/meta-arm/recipes-security/optee/optee-examples.bb b/meta-
> arm/recipes-security/optee/optee-examples_git.bb
> similarity index 87%
> rename from meta-arm/recipes-security/optee/optee-examples.bb
> rename to meta-arm/recipes-security/optee/optee-examples_git.bb
> index aaec4c4..768a55b 100644
> --- a/meta-arm/recipes-security/optee/optee-examples.bb
> +++ b/meta-arm/recipes-security/optee/optee-examples_git.bb
> @@ -1,10 +1,13 @@
> SUMMARY = "OP-TEE examples"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Sample
> Applications"
> HOMEPAGE = "https://github.com/linaro-swg/optee_examples"
>
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
>
> -DEPENDS = "optee-client optee-os python-pycrypto-native"
> +PV = "3.8.0+git${SRCPV}"
> +
> +DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
>
> inherit python3native
>
> --
> 2.7.4
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 5/5] optee-examples: cleanup
2020-04-01 23:13 ` [PATCH 5/5] optee-examples: cleanup Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
@ 2020-04-02 9:57 ` Peter Griffin
2020-04-02 16:29 ` Denys Dmytriyenko
1 sibling, 1 reply; 18+ messages in thread
From: Peter Griffin @ 2020-04-02 9:57 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]
Hi Denys,
On Thu, 2 Apr 2020 at 00:13, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Rename with _git suffix to match other optee recipes
> * Set PV
> * Add DESCRIPTION
> * Depend on Python3 version of PyCryptodomex instead of Python2 version of
> PyCrypto
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> .../optee/{optee-examples.bb => optee-examples_git.bb} | 5
> ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
> rename meta-arm/recipes-security/optee/{optee-examples.bb =>
> optee-examples_git.bb} (87%)
>
> diff --git a/meta-arm/recipes-security/optee/optee-examples.bb
> b/meta-arm/recipes-security/optee/optee-examples_git.bb
> similarity index 87%
> rename from meta-arm/recipes-security/optee/optee-examples.bb
> rename to meta-arm/recipes-security/optee/optee-examples_git.bb
> index aaec4c4..768a55b 100644
> --- a/meta-arm/recipes-security/optee/optee-examples.bb
> +++ b/meta-arm/recipes-security/optee/optee-examples_git.bb
> @@ -1,10 +1,13 @@
> SUMMARY = "OP-TEE examples"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Sample
> Applications"
> HOMEPAGE = "https://github.com/linaro-swg/optee_examples"
>
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
>
> -DEPENDS = "optee-client optee-os python-pycrypto-native"
> +PV = "3.8.0+git${SRCPV}"
>
You have set PV to indicate 3.8.0 but not updated the SRCREV?
Apart from that:
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
regards,
Peter.
[-- Attachment #2: Type: text/html, Size: 3142 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components
2020-04-01 23:13 [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Denys Dmytriyenko
` (4 preceding siblings ...)
2020-04-02 7:19 ` [meta-arm] [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Diego Sueiro
@ 2020-04-02 9:59 ` Peter Griffin
5 siblings, 0 replies; 18+ messages in thread
From: Peter Griffin @ 2020-04-02 9:59 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 921 bytes --]
On Thu, 2 Apr 2020 at 00:13, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> optee components use pycrypto, pycryptodomex and pyelftools from
> meta-python layer
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
---
> meta-arm/conf/layer.conf | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf
> index 0b93e8d..d96e9f1 100644
> --- a/meta-arm/conf/layer.conf
> +++ b/meta-arm/conf/layer.conf
> @@ -9,5 +9,8 @@ BBFILE_COLLECTIONS += "meta-arm"
> BBFILE_PATTERN_meta-arm = "^${LAYERDIR}/"
> BBFILE_PRIORITY_meta-arm = "6"
>
> -LAYERDEPENDS_meta-arm = "core"
> +LAYERDEPENDS_meta-arm = " \
> + core \
> + meta-python \
> +"
> LAYERSERIES_COMPAT_meta-arm = "warrior zeus dunfell"
> --
> 2.7.4
>
>
>
[-- Attachment #2: Type: text/html, Size: 1671 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup
2020-04-01 23:13 ` [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
@ 2020-04-02 10:01 ` Peter Griffin
2020-04-02 16:30 ` Denys Dmytriyenko
1 sibling, 1 reply; 18+ messages in thread
From: Peter Griffin @ 2020-04-02 10:01 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 2515 bytes --]
Hi Denys,
On Thu, 2 Apr 2020 at 00:13, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Rename with _git suffix to match other optee recipes
> * Add DESCRIPTION
> * Use common HOMEPAGE
> * Use install command for header files instead of cp -a
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>
Minor nit patch subject 3,8,0, should be 3.8.0. Apart from that
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
> ---
> .../optee/{optee-client.bb => optee-client_git.bb} | 20
> ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
> rename meta-arm/recipes-security/optee/{optee-client.bb =>
> optee-client_git.bb} (63%)
>
> diff --git a/meta-arm/recipes-security/optee/optee-client.bb
> b/meta-arm/recipes-security/optee/optee-client_git.bb
> similarity index 63%
> rename from meta-arm/recipes-security/optee/optee-client.bb
> rename to meta-arm/recipes-security/optee/optee-client_git.bb
> index 519683a..a25d343 100644
> --- a/meta-arm/recipes-security/optee/optee-client.bb
> +++ b/meta-arm/recipes-security/optee/optee-client_git.bb
> @@ -1,18 +1,21 @@
> -SUMMARY = "OPTEE Client"
> -HOMEPAGE = "https://github.com/OP-TEE/optee_client"
> +SUMMARY = "OP-TEE Client API"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World
> Client side of the TEE"
> +HOMEPAGE = "https://www.op-tee.org/"
>
> LICENSE = "BSD"
> LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
>
> -PV = "3.7.0+git${SRCPV}"
> +PV = "3.8.0+git${SRCPV}"
>
> inherit python3native systemd
>
> -SRC_URI = "git://github.com/OP-TEE/optee_client.git \
> - file://tee-supplicant.service"
> -S = "${WORKDIR}/git"
> +SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
> +SRC_URI = " \
> + git://github.com/OP-TEE/optee_client.git \
> + file://tee-supplicant.service \
> +"
>
> -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
> +S = "${WORKDIR}/git"
>
> SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
>
> @@ -25,7 +28,8 @@ do_install() {
> ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
> ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
>
> - cp -a ${S}/out/export/usr/include ${D}/usr/
> + install -d ${D}${includedir}
> + install -p -m0644 ${S}/out/export/usr/include/*.h ${D}${includedir}
>
> sed -i -e s:/etc:${sysconfdir}:g \
> -e s:/usr/bin:${bindir}:g \
> --
> 2.7.4
>
>
>
[-- Attachment #2: Type: text/html, Size: 4562 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup
2020-04-01 23:13 ` [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
@ 2020-04-02 10:02 ` Peter Griffin
1 sibling, 0 replies; 18+ messages in thread
From: Peter Griffin @ 2020-04-02 10:02 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 4122 bytes --]
On Thu, 2 Apr 2020 at 00:13, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Drop previously backported patch for Python3 support
> * Add DESCRIPTION
> * Use common HOMEPAGE
> * Depend on PyCryptodomex instead of old PyCrypto
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
---
> .../0001-use-python3-instead-of-python.patch | 48
> ----------------------
> meta-arm/recipes-security/optee/optee-test_git.bb | 15 ++++---
> 2 files changed, 7 insertions(+), 56 deletions(-)
> delete mode 100644
> meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch
>
> diff --git
> a/meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch
> b/meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch
> deleted file mode 100644
> index 20f190a..0000000
> ---
> a/meta-arm/recipes-security/optee/optee-test/0001-use-python3-instead-of-python.patch
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -From 6271160639002a2580d80b75b5397a96d56329f2 Mon Sep 17 00:00:00 2001
> -From: Scott Branden <scott.branden@broadcom.com>
> -Date: Fri, 27 Dec 2019 12:54:28 -0800
> -Subject: [PATCH] use python3 instead of python
> -
> -use python3 instead of python as python2 is EOL January 2020.
> -
> -Signed-off-by: Scott Branden <scott.branden@broadcom.com>
> -Reviewed-by: Jerome Forissier <jerome@forissier.org>
> -Tested-by: Jerome Forissier <jerome@forissier.org> (QEMU,
> CFG_GCM_NIST_VECTORS=y)
> -Upstream-Status: Backport from v3.8.0
> ----
> - scripts/file_to_c.py | 4 ++--
> - scripts/rsp_to_gcm_test.py | 2 +-
> - 2 files changed, 3 insertions(+), 3 deletions(-)
> -
> -diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py
> -index ae16f52..b4ce2a2 100755
> ---- a/scripts/file_to_c.py
> -+++ b/scripts/file_to_c.py
> -@@ -1,4 +1,4 @@
> --#!/usr/bin/env python
> -+#!/usr/bin/env python3
> - # SPDX-License-Identifier: BSD-2-Clause
> - #
> - # Copyright (c) 2018, Linaro Limited
> -@@ -29,7 +29,7 @@ def main():
> -
> - f.write("const uint8_t " + args.name + "[] = {\n")
> - i = 0
> -- for x in array.array("B", inf.read()):
> -+ for x in array.array("B", map(ord, (inf.read()))):
> - f.write("0x" + '{0:02x}'.format(x) + ",")
> - i = i + 1
> - if i % 8 == 0:
> -diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py
> -index 0543541..e4418be 100755
> ---- a/scripts/rsp_to_gcm_test.py
> -+++ b/scripts/rsp_to_gcm_test.py
> -@@ -1,4 +1,4 @@
> --#!/usr/bin/env python
> -+#!/usr/bin/env python3
> -
> - modes = {'encrypt': 0, 'decrypt': 1}
> -
> ---
> -2.7.4
> -
> diff --git a/meta-arm/recipes-security/optee/optee-test_git.bb
> b/meta-arm/recipes-security/optee/optee-test_git.bb
> index 3f431c3..752d75d 100644
> --- a/meta-arm/recipes-security/optee/optee-test_git.bb
> +++ b/meta-arm/recipes-security/optee/optee-test_git.bb
> @@ -1,21 +1,20 @@
> SUMMARY = "OP-TEE sanity testsuite"
> -HOMEPAGE = "https://github.com/OP-TEE/optee_test"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
> +HOMEPAGE = "https://www.op-tee.org/"
>
> LICENSE = "BSD & GPLv2"
> LIC_FILES_CHKSUM =
> "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
>
> inherit python3native
>
> -DEPENDS = "optee-client optee-os python3-pycrypto-native"
> +DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
>
> -PV = "3.7.0+git${SRCPV}"
> +PV = "3.8.0+git${SRCPV}"
>
> -SRC_URI = "git://github.com/OP-TEE/optee_test.git \
> - file://0001-use-python3-instead-of-python.patch \
> - "
> -S = "${WORKDIR}/git"
> +SRCREV = "30481e381cb4285706e7516853495a7699c93b2c"
> +SRC_URI = "git://github.com/OP-TEE/optee_test.git"
>
> -SRCREV = "227d6f4c40eaa6f84fe049b9e48c7b27ad7fab08"
> +S = "${WORKDIR}/git"
>
> OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
> TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}"
> --
> 2.7.4
>
>
>
[-- Attachment #2: Type: text/html, Size: 6250 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 5/5] optee-examples: cleanup
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
@ 2020-04-02 16:27 ` Denys Dmytriyenko
0 siblings, 0 replies; 18+ messages in thread
From: Denys Dmytriyenko @ 2020-04-02 16:27 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko, nd
On Thu, Apr 02, 2020 at 07:21:47AM +0000, Diego Sueiro wrote:
> > -----Original Message-----
> > From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> > On Behalf Of Denys Dmytriyenko via lists.yoctoproject.org
> > Sent: 02 April 2020 00:13
> > To: meta-arm@lists.yoctoproject.org
> > Cc: Denys Dmytriyenko <denys@ti.com>
> > Subject: [meta-arm] [PATCH 5/5] optee-examples: cleanup
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > * Rename with _git suffix to match other optee recipes
> > * Set PV
> > * Add DESCRIPTION
> > * Depend on Python3 version of PyCryptodomex instead of Python2 version
> > of PyCrypto
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>
> Can we take this opportunity to upgrade this recipe to 3.8.0 as well?
See the PV addition below - it is already at 3.8.0
> > ---
> > .../optee/{optee-examples.bb => optee-examples_git.bb} | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-) rename meta-arm/recipes-
> > security/optee/{optee-examples.bb => optee-examples_git.bb} (87%)
> >
> > diff --git a/meta-arm/recipes-security/optee/optee-examples.bb b/meta-
> > arm/recipes-security/optee/optee-examples_git.bb
> > similarity index 87%
> > rename from meta-arm/recipes-security/optee/optee-examples.bb
> > rename to meta-arm/recipes-security/optee/optee-examples_git.bb
> > index aaec4c4..768a55b 100644
> > --- a/meta-arm/recipes-security/optee/optee-examples.bb
> > +++ b/meta-arm/recipes-security/optee/optee-examples_git.bb
> > @@ -1,10 +1,13 @@
> > SUMMARY = "OP-TEE examples"
> > +DESCRIPTION = "Open Portable Trusted Execution Environment - Sample
> > Applications"
> > HOMEPAGE = "https://github.com/linaro-swg/optee_examples"
> >
> > LICENSE = "GPLv2"
> > LIC_FILES_CHKSUM =
> > "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
> >
> > -DEPENDS = "optee-client optee-os python-pycrypto-native"
> > +PV = "3.8.0+git${SRCPV}"
> > +
> > +DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
> >
> > inherit python3native
> >
> > --
> > 2.7.4
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 5/5] optee-examples: cleanup
2020-04-02 9:57 ` Peter Griffin
@ 2020-04-02 16:29 ` Denys Dmytriyenko
0 siblings, 0 replies; 18+ messages in thread
From: Denys Dmytriyenko @ 2020-04-02 16:29 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
On Thu, Apr 02, 2020 at 10:57:51AM +0100, Peter Griffin wrote:
> Hi Denys,
>
> On Thu, 2 Apr 2020 at 00:13, Denys Dmytriyenko <denis@denix.org> wrote:
>
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > * Rename with _git suffix to match other optee recipes
> > * Set PV
> > * Add DESCRIPTION
> > * Depend on Python3 version of PyCryptodomex instead of Python2 version of
> > PyCrypto
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > .../optee/{optee-examples.bb => optee-examples_git.bb} | 5
> > ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> > rename meta-arm/recipes-security/optee/{optee-examples.bb =>
> > optee-examples_git.bb} (87%)
> >
> > diff --git a/meta-arm/recipes-security/optee/optee-examples.bb
> > b/meta-arm/recipes-security/optee/optee-examples_git.bb
> > similarity index 87%
> > rename from meta-arm/recipes-security/optee/optee-examples.bb
> > rename to meta-arm/recipes-security/optee/optee-examples_git.bb
> > index aaec4c4..768a55b 100644
> > --- a/meta-arm/recipes-security/optee/optee-examples.bb
> > +++ b/meta-arm/recipes-security/optee/optee-examples_git.bb
> > @@ -1,10 +1,13 @@
> > SUMMARY = "OP-TEE examples"
> > +DESCRIPTION = "Open Portable Trusted Execution Environment - Sample
> > Applications"
> > HOMEPAGE = "https://github.com/linaro-swg/optee_examples"
> >
> > LICENSE = "GPLv2"
> > LIC_FILES_CHKSUM =
> > "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30"
> >
> > -DEPENDS = "optee-client optee-os python-pycrypto-native"
> > +PV = "3.8.0+git${SRCPV}"
> >
>
> You have set PV to indicate 3.8.0 but not updated the SRCREV?
Same SRCREV - the code hasn't been updated between 3.7.0 and 3.8.0
> Apart from that:
> Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
>
> regards,
>
> Peter.
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup
2020-04-02 10:01 ` Peter Griffin
@ 2020-04-02 16:30 ` Denys Dmytriyenko
2020-04-03 8:52 ` Peter Griffin
0 siblings, 1 reply; 18+ messages in thread
From: Denys Dmytriyenko @ 2020-04-02 16:30 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
On Thu, Apr 02, 2020 at 11:01:17AM +0100, Peter Griffin wrote:
> Hi Denys,
>
> On Thu, 2 Apr 2020 at 00:13, Denys Dmytriyenko <denis@denix.org> wrote:
>
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > * Rename with _git suffix to match other optee recipes
> > * Add DESCRIPTION
> > * Use common HOMEPAGE
> > * Use install command for header files instead of cp -a
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >
>
> Minor nit patch subject 3,8,0, should be 3.8.0. Apart from that
Ah, indeed, thanks for noticing!
Do you want v2 with this fixed?
> Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
>
>
> > ---
> > .../optee/{optee-client.bb => optee-client_git.bb} | 20
> > ++++++++++++--------
> > 1 file changed, 12 insertions(+), 8 deletions(-)
> > rename meta-arm/recipes-security/optee/{optee-client.bb =>
> > optee-client_git.bb} (63%)
> >
> > diff --git a/meta-arm/recipes-security/optee/optee-client.bb
> > b/meta-arm/recipes-security/optee/optee-client_git.bb
> > similarity index 63%
> > rename from meta-arm/recipes-security/optee/optee-client.bb
> > rename to meta-arm/recipes-security/optee/optee-client_git.bb
> > index 519683a..a25d343 100644
> > --- a/meta-arm/recipes-security/optee/optee-client.bb
> > +++ b/meta-arm/recipes-security/optee/optee-client_git.bb
> > @@ -1,18 +1,21 @@
> > -SUMMARY = "OPTEE Client"
> > -HOMEPAGE = "https://github.com/OP-TEE/optee_client"
> > +SUMMARY = "OP-TEE Client API"
> > +DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World
> > Client side of the TEE"
> > +HOMEPAGE = "https://www.op-tee.org/"
> >
> > LICENSE = "BSD"
> > LIC_FILES_CHKSUM =
> > "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
> >
> > -PV = "3.7.0+git${SRCPV}"
> > +PV = "3.8.0+git${SRCPV}"
> >
> > inherit python3native systemd
> >
> > -SRC_URI = "git://github.com/OP-TEE/optee_client.git \
> > - file://tee-supplicant.service"
> > -S = "${WORKDIR}/git"
> > +SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
> > +SRC_URI = " \
> > + git://github.com/OP-TEE/optee_client.git \
> > + file://tee-supplicant.service \
> > +"
> >
> > -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
> > +S = "${WORKDIR}/git"
> >
> > SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
> >
> > @@ -25,7 +28,8 @@ do_install() {
> > ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
> > ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
> >
> > - cp -a ${S}/out/export/usr/include ${D}/usr/
> > + install -d ${D}${includedir}
> > + install -p -m0644 ${S}/out/export/usr/include/*.h ${D}${includedir}
> >
> > sed -i -e s:/etc:${sysconfdir}:g \
> > -e s:/usr/bin:${bindir}:g \
> > --
> > 2.7.4
> >
> >
> >
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-arm] [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup
2020-04-02 16:30 ` Denys Dmytriyenko
@ 2020-04-03 8:52 ` Peter Griffin
0 siblings, 0 replies; 18+ messages in thread
From: Peter Griffin @ 2020-04-03 8:52 UTC (permalink / raw)
To: meta-arm; +Cc: Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
Hi Denys
On Thu, 2 Apr 2020 at 17:30, Denys Dmytriyenko <denis@denix.org> wrote:
> On Thu, Apr 02, 2020 at 11:01:17AM +0100, Peter Griffin wrote:
> > Hi Denys,
> >
> > On Thu, 2 Apr 2020 at 00:13, Denys Dmytriyenko <denis@denix.org> wrote:
> >
> > > From: Denys Dmytriyenko <denys@ti.com>
> > >
> > > * Rename with _git suffix to match other optee recipes
> > > * Add DESCRIPTION
> > > * Use common HOMEPAGE
> > > * Use install command for header files instead of cp -a
> > >
> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > >
> >
> > Minor nit patch subject 3,8,0, should be 3.8.0. Apart from that
>
> Ah, indeed, thanks for noticing!
> Do you want v2 with this fixed?
>
May as well I suppose.
Peter.
[-- Attachment #2: Type: text/html, Size: 1349 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2020-04-03 8:53 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-01 23:13 [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Denys Dmytriyenko
2020-04-01 23:13 ` [PATCH 2/5] optee-os: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
2020-04-02 7:20 ` [meta-arm] " Diego Sueiro
2020-04-01 23:13 ` [PATCH 3/5] optee-client: upgrade 3.7.0 -> 3,8,0, cleanup Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
2020-04-02 10:01 ` Peter Griffin
2020-04-02 16:30 ` Denys Dmytriyenko
2020-04-03 8:52 ` Peter Griffin
2020-04-01 23:13 ` [PATCH 4/5] optee-test: upgrade 3.7.0 -> 3.8.0, cleanup Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
2020-04-02 10:02 ` Peter Griffin
2020-04-01 23:13 ` [PATCH 5/5] optee-examples: cleanup Denys Dmytriyenko
2020-04-02 7:21 ` [meta-arm] " Diego Sueiro
2020-04-02 16:27 ` Denys Dmytriyenko
2020-04-02 9:57 ` Peter Griffin
2020-04-02 16:29 ` Denys Dmytriyenko
2020-04-02 7:19 ` [meta-arm] [PATCH 1/5] layer.conf: add meta-python to LAYERDEPENDS for optee components Diego Sueiro
2020-04-02 9:59 ` Peter Griffin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.